renaming and cleaning