extract method finding logic into a class
Slightly better output