Tidied everything up