some comments/reorganization