Removed unneeded lambda function.
Other minor clean ups.

Signed-off-by: Andrew Maclean <andrew.amaclean@gmail.com>