Redesign comments.

Change-Id: Ic628e39a9a0a3cf720f181bb78b7057d1748de45