Cleaner markup.

Change-Id: Iac45baebf3eaec5ec7804f1686be44885c8aed8c