Code style, docblock comments

Change-Id: I825b3a7649f99b92a6610e92b184252c63bf3f7a