Working refactored code, but not 'production ready'
Merge pull request #2 from shortdiv/refactor

Shortened code