clean up and added log lines

Change-Id: I9809eb86e99fb3d5a015180e38f32935bb7c3c38