minor tidy up
html entities' encoding fixed
small cleanup