Some tidying