tidied up a thing or two