refactoring
refactor again
Merge pull request #9 from alvinsj/refactoring

Refactoring