Use lambda for minor refactoring

Comment From: sbrannen

This has been merged into master and slightly revised in 1f35cc5cae5027a4cc78a2e5e30ce89f8418b607.

Thanks