Clean-up and parameterizing.