more and more cleanup, consolidation, and renaming