Removed pass by reference assignments