Beginning the overhaul. Sample of first 50 lines.
Removing parentheses around lambdas.
Some more changes.
Merge branch 'master' into overhaul