removed List.each with List.find