some cleanups of code
Merge branch 'master' of https://github.com/dgubernatorov-softheme/ExchangeDumper
replace empty mark for html