Started moving to under_score variable names in preference to capNoScores. PEP8. Sigh.
Minor comment changes.