improving markup
improving markup and removing self-closing