Made this.own updates from the code review feedback