Remove comments
Text is content
Rename block elements
Refactoring