Code and Comment Clean Up 2

Just cleaned up the code and comments. Tested everything. It appears to
work. Note again that the branches include the code fails for problem 3.
These are not included in the master.