reorganization and some comments