Incorporate code review feedback