cleanup and doc

Change-Id: I2ff80bc0994937798c179a4ab189746e308e9f70