GH115 - code review modifications