tidied up a couple things