Cleaning up code style for consistency, no functional changes.
Merge pull request #22 from benjamin-bader/reformat

Cleaning up code style for consistency, no functional changes.