tweaks / cleanup