code cleanup minor tweaks