Stricter HTML validation
Cleaned up
Cleaned up