Rework comments to use less space