Minor refactoring
Minor refactoring of minor refactoring
Merge pull request #11 from knsd/patch-2

Minor refactoring