tidy up a little