Tweaked the logging + some minor style fixes.

Change-Id: If89fe8ab1845780ecf23c5fd339a4932ebec9c0c
8 files changed