GH166 - code review modifications