renaming and clean up