Changes for code review feedback