removing the passing by reference on all methods