simply logic, remove unused switch, add -e (fix)