Make judge more pythonic; clean up