HTML5 Support, Refactoring