some small refactors
Merge pull request #51 from dalexj/alex

some small refactors