Reorganization + commenting