Tweak var names.
Code cleanup.
More code cleanup. Yuck.