Lint and clean-up the code.
Merge pull request #31 from busykai/lint-cleanup

Lint and clean-up the code.