util refactor