Tidied up variable naming convention