Tidied up some