Refactoring + Text Preprocessor added