Tidied a little