Tidied up some things