tidying up extends