Moved function arguments into object variables