Docstring work

Change-Id: Ifd928ceaccf7bb142310fba0a3a555813c4cabae