nit refactoring
Merge pull request #1 from sunglim/foo

nit refactoring
Merge branch 'master' into mychange