renaming and cleanup