Tidy up comment formatting
Merge branch 'dev'