Cleanup

Don't know why we didn't ever merge this @cjbell88 @ninjabiscuit?

Tests pass.