Address code review note from Kennedy