Improve debug output (and some clean up)
Improve debug output (and some clean up)

Change-Id: Ibce90b4eeab679d526f0e0b1e9a8ab3b14255622

JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core