Refactoring to connected presenter