refactor .some method

refactor .some method