SoDFReader: refactoring