Cleanup: use std::find_if