more code review addressing