Refactoring Race, Timer and API