Changing markup to better reflect semantic meaning of content. Improve the readability.

As stated in PR name.