Resolve code review comments