added races, cleaned code