Updates for code review