Correct various style inconsistancies