Code Clean Up
Merge pull request #73 from jocelynlih/ankur-code-clean-up

Code Clean Up