Perf improvement from review