Fix some coding style inconsistencies