Fixed some coding guideline issues