Small reduction of memory used