tidied up some variable names