Update based on code review