Fix some code style inconsistencies