Formatting

Consistent code styling to allow other people to contribute (*cough* me *cough*)