tidying up and renaming