Updating code with comments from the code review with Hugo Corbucci