Refine cli options