Revert "clean up the code"
Merge pull request #3 from jxnl/revert-2-wwang_beta

Revert "clean up the code"