I think the only places you need to do this are here and on lines 36 and 37.

The way you are indenting the anonymous functions is fine.