Reduce use of references