Major cleanup/improvement to WinnerChecker class