Refactor the presenter functions