a few clean-up tweaks