Modify for code review