Fix picky code review feedback