improve commands options