some clean up in Learner class