Refactor all the things
Merge pull request #15 from rackerlabs/refactor

Refactor all the things