minor refactor
Merge pull request #1 from alexcruice/master

minor refactor