tidy up a little more