tidied a couple of things