Refactor predictions