MainPresenter refactor