Refactor presenter interface