Fixing some tedious codestyle inconsistencies