First round of cleanup on models.py

note that quality_test is the ideal to shoot for.