Missed some spots in the cleanup
I miss high order functions