Improve the Code quality to make HTML5 Valid code