SuperDuper Extra Credit final

cleaned up the code and removed extraneous unneeded variables and
"simplified" things somewhat.