Issue 591: code review changes