Fix style inconsistencies