Sanitize, HTML markup, strict logical op

Sanitize whitespaces, unify markup in XHTML style, change to strict
logical operator