Coding convention corrections done