Minor improvement in CPU usage