tweaks for cleanup