minor refactoring
Merge pull request #40 from Cyan4973/dev

minor refactoring