Fixed a lot of the naming schemes and removed some unneccessary
variables.  We also got rid of comments by refactoring bits of code in
methods so that it made more sense.  This refactor deals wth the
namingScheme and comments smell from our proposal.