reorganization & expanded comments