Fixed a few style inconsistencies