improve main command