Refactoring, squash if all tests pass.

Signed-off-by caleb miles <caleb.miles@inktank.com>