Issue 289: code review changes