Tidy up formatting a little
Merge branch 'fix/formatting'