tidied a bit