Tidied a bit