tidied a little