refactoring, added comments on hacky codes
Merge pull request #131 from jackykschou/JackySprint11

refactoring, added comments on hacky codes