Refactoring: Updated HtmlReader to more generic MarkupReader to imply its exact purpose