tidied some more