Improved naming conventions, refactored predictions logic.