Reorganization and comments ONLY - no functional changes