Code style cleanup.
Merge pull request #22 from reload/code-style-cleanup

Code style cleanup.