Make CLI parameters more intuitive