Tidying things up.