cleanup and renaming.