Refactor #2 on arg parser.