Don't repeat subtitle, and make very minor style improvements in it

Change-Id: I542d04e0b528b3135545c8bed5b3c561851ffe7e
Merge "Don't repeat subtitle, and make very minor style improvements in it"