Refactor connected presenter to composition