Changed things.
Merge pull request #2 from tommyvyo/refactor

Was wet... and now its dry-er