The great reformat

Putting all the reformatting commits from #75 onto a separate PR for better clarity.