improve parse command