refactoring code
Merge pull request #65 from KKBOX/dev_wendy

refactoring code