Some tidying up.