Tidying things up a little.