Refactor out code reek