refactor
Merge pull request #6 from octanner/refactor

Woot!