Tidied some more