Refactoring preprocessors