Some tidying up