Fixes according to Michael's comments
Use consistent style for lambda