Issue 193: code review changes