Another minor refactoring... Gonna continue later to maximize prediction correctness.