learner code clean-up