Ensuring that I get all of the points possible for this assignment.  And some clean up of the code.