Sanitize whitespaces, unify markup, strict logical operator

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