Refactoring: Updated HtmlBufferedReader to HtmlReader to be more direct, updated references as well