Tidying up helpers, moving JS functionality into a JS specific helper