Improve Races

Added comments and cleaned up code for races.