Cleaned up the way winners are determined.