Add suggested changes from code review feedback