minor tweaks / cleanup.