migrated several more function parameters to class parameters