Started to do some code cleaning.  More to be done.