Some simplification.  Removed some things users need not do.
Formatting changes.