Fixed some coding convention inconsistencies