refactor
Merge pull request #17 from kevinquinnyo/more-refactor

refactor