Tidied up some variables