migrated several function parameters to class parameters