minor tweaks and cleanups