just tidied up a bit