minor tweaks and clean-up