Refactoring DocBrowser