Update for code review feedback