Refactor args to cli.args