cleaning up and renaming