Remove passing params by reference