Tidied up some var names