Fixed some coding standard inconsistencies