After cohort review, added refactor comments