cleaning up variables to have a master object param