RF - move around some of the predict stuff

Just a little bit of cleanup of the predict code. @arokem can you look over this when you have time.