Minor improvement in memory usage