Reduce reference use