Cleaned up parameterization a little bit.