improved readability and markup

Removed whitespace

Added markup per conventions

Change-Id: I5808872930806c7bde90564d5fade0d5486083fb
Partial-Bug: #1217503
Merge "improved readability and markup"