Refactor presenter