Whitespace and HTML comment fix

Test Plan:
<see below>