Some tidying.