Cleaning up and parameterization