Cleanup: Code formatting.
Merge pull request #313 from am11/master

Cleanup: Code formatting.