cleanup and renaming