Another lambda improvement
Clean up
And more clean up