Improve logs, format and clean up

Change-Id: I89a19c76d7e3f07d66bad11fc1df584de59e32a3