Clean up an ugly while loop
Clean out unnecessary tie break reporting setup method in Query