Utility classes refactoring