minor tweaks / cleanup