Issue 461: code review changes