Improve memory usage a bit