tidied up a few things