Align comments to scenario