Cleaned up bad variable names.
Merge pull request #40 from rcconvict/master

More misc. cleanup.