Code formatting updates
Merge pull request #298 from siebrand/8

Code formatting updates