tidied up

Cleaned up parameterisation