Much DRYer
My terrible unDRY mess with the race