naming cleanup and organizational tweaks