Tidying up a little.