Moved more methods to helpers to tidy up main app file