Changed the formatter and made minor tweaks
Merge pull request #6 from Scissr/development

Changed the formatter and made minor tweaks