small tweaks to modular design