Fixed some coding conventions issues