minor refactoring
Merge pull request #1 from EdwardKang/master

minor refactoring