Tidy up for the improvement to the speed of predicting