Some tidying up to do