Style changes from Pull Request #7

[joeljfischer]

Since the only big stopper on the other pull request in the queue, I just reverted the styling as requested. This is missing some updates that happened in the meantime, but so much changed that it could be a big hairpull to try and merge properly.