app UX improvements, removing unnecessary helpers