Util refactoring