initial refactor
Merge pull request #8 from mtabor150/refactor

initial refactor