Presenter refactoring