Corrections to comply with coding convention