cleaning up logging a bit

Change-Id: I58cf1beb9545505cb6da91be37901e9ed642c3d1