few additional organizational tweaks