Commentary re-structuring