minor organizational tweaks