Code cleanup.

Change-Id: I053e407ed7f27ee8c5cd3cb23fe2a840d963826f
improved documentation

Change-Id: Ie943a181ffe2ac28f331e5356ee11745ba42b07e