clean up
refactor
Merge pull request #3 from aantthony/refactor

Refactor