Changed the races, cleaned the imports on the two classes