Improve pydoc

Change-Id: Ic41eeb6b34973f7d7a2440187c45a319447739eb