refactor, and fixes #1
Merge pull request #3 from theonion/updates

refactor, and fixes #1