PDF Export class refactoring