improved collectFirst, removed obsolete comment