finishing a refactor stage of the FindingEngine