Minor improvements to object-oriented structure.  Removed a friendship,
and a few public functions that were not needed.