Change nested ifs to methods
Don't mistake ties for team races
Correctly differentiate ties from team results
Merge master