Cleaned up, a little.  Improved architecture.