Move HTML processing to filter
Syntax cleanup
Indent 2 -> 4