Parameterize classes

Fix parameter name and fix indentation

Minor fix to install and parameterize service class

Parameterize classes