small tweaks for performance