tidied up a bit
oops, one more