extract class finding logic to own class