CLEAN UP 1
clean up 1.5
clean up 2
Merge pull request #35 from Chareesa/dev

cleanup one