Formatting
Merge pull request #216 from njam/formatting

Apply formatting