tidied a couple things up