Code cleanup in predict.cpp