Improve Preprocessor