Add trailing commas and fix multi-new-lines
Merge pull request #41 from nickvergessen/fix-code-layout

Add trailing commas and fix multi-new-lines