Refactors some helpers and updates Presenter implementation