finish race email refactoring