Issue 193: further code review changes