Significant cosmetic changes to the code.  Refactored a couple
of poorly written methods.