extract functionality to finder methods
Extract functionality to Module