Folding in all the feedback from code review + review with onboarding team