Name some args better.
And more cleanup.