Implement use of helper methods to eliminate repetitive Find.match_by_name calls