Updated class parameter lists to declare parameters as vals/vars to avoid
the need to copy the param into a class variable.