Initial code cleanup of the HtmlUnit driver

Initial code cleanup of the HtmlUnit driver