FEAT: minor simplify for  function.