Minor cleanup in the way the trainees are started