Fix style inconsistences