refactoring on util package