Race refactoring