more tweaks for clarity