Cleanup code
Merge pull request #2 from nuteup/chore-code-style

Cleanup code