Minor cleanup. Added more logging info.