Reduce use of references for objects