Tidy up a little.