Refactoring the util package back to helper