whitespace tidy up and a remove trailing comma.
Merge branch 'feature/bugfix-fix-loose-comma' into develop