renaming and cleaning up