Refactor, refactor, refactor

Jared Sorge @jsorge