Clean up of Array.find