various cosmetic changes.

Changes the names of some of the dummy arguments.
Removed some unnecessary code.
Some additional commenting.

Author: jacobwilliams