Some refactoring, working on race line evaluation