Some tidy up and renaming