Adding prediction support for unplayed games
Cleaning up the code