Reorganization and more comments