Started HtmlDocGenerator code refactoring
Code Refactoring
Completed HtmlDocGenerator code refactoring