Update to Non-Trustee Predictive Scoring Engine

Post-Consultation with Paul.

Better Commenting, fewer joins, parameters as variables