Issue 647: Code review changes