Refactored PdePreprocessor class