Refactored MainPresenter ; Improved style