tidied it up