Fixed reversed isValid() check

Was a reversion which broke tracking from the list
Cleanup of predictionmanager output

Also minor code cleanup.