Refactor CEDocumentAnalyzer class a bit