Improve comments throughout

Change-Id: I2c9f2c3d5a59511ba43e4dd75d46da18b185110b