Merge pull request #58 from kito-cheng/master

Clean up and refactor