Coding styles

If you feel like merging this, be my guest. :)