PdfFileExporter refactored