doing some clean up and renaming.