Removing pass by reference