Refactoring predictor

Predictor being refactored