Simpler way of doing perf optimisation