Changes per code review comments