Simplifying some closures
Removing an obsolete comment