minor tweaks for performance