reorganization and a couple comments