Tidied up everything