[CLEANUP] Clean up the indentation levels.
Merge pull request #22 from oliverklee/cleanup/indentation

[CLEANUP] Clean up the indentation levels.