cleaning up and renaming stuff