coding convention and comments updates