Global refactoring started. Clean HTML