Tidied up some of the variables to make them more standard.