Better formatting of API docs

Change-Id: Iaec25655c951619c281f5877ee53d7ab462f12c5