refactor -> remove find operator