Refactor classifier and preprocessing.