Improve a performance bottleneck