Updates for code review feedback