Refactoring, clean HTML