lots of clean up and renaming