Removed subclassing and reformatted

Classes had been listed as subclasses, removed that.  Adjusted
formatting.  Worked on removing errors.