more cleanup and renaming