Tidy up formatting
Merge branch 'dev'