small cleanup to parse-cli-args, hopefully it gets more soon