More style cleanup and stray logging :lipstick:

Change-Id: I820d9bd11ab2f820ba070975d23d7fd505a99c0d