Minor refactor of Race model