perf util refactor and update