tidy up a little bit