Fixed callback and some formatting changes.

Change-Id: I5c5e8f588a1553b90d779713aec3471b83467383