update for comment as per code review feedback