Minor Refactoring and fixing preProcess-Behaviour