tweaks, minor code cleanup