cleanups
minor tweaks