Refactor + Races