tidied a few things up