Update code formatting

Based on CodeSniffer output
Merge pull request #230 from siebrand/7

Update code formatting