Merge pull request #309 from am11/master

Cleanup: Code formatting.