Cleanup
Better checking of cyclist name