Better refactoring for util classes