Fix code review comments from ravage84