General cleanup; Adds puphpet::params