Refactor classes to use params.pp