tweaks/cleanup