--skipeachvalid + cleaned the CLI options