Fix some style inconsistencies