Incorporates code review comments