Some more efficient memory uses change