tidied everything up