minor tweaks and cleanup