Minor refactoring of IntentPerf for readability and functionality