Refactor, removing unnecessary abstraction.