Minor refactor
Merge pull request #127 from jerv13/master

Minor refactor