Reformatted
Merge pull request #322 from bastih/master-reformat

Clean up code formatting by use of `make reformat`