Followed up on discussions code review