Modify for Code review feedback.