Issue 443: code review changes