Misc formatting stuff
Merge branch 'HenryTestBranch'