cleans up Main class.  Incremental gains, much pain.