Tidied it up