Cleaned up HTML structure