Refactores order of functions on helper