Issue 328: code review changes