A little reorganization and cleanup.