Parameterized class, puppet lint cleanup, more options