Further polished the command