Code clean up WIP 1
Code clean up WIP 2
Code clean up WIP 3
Code clean up WIP 4
Merge pull request #17 from kevin1liang/master

Code clean up