Update based on code review feedback