Incorporate code review comments