Renamed "unused" lambda arguments to "_"
Misc tweaks