Resolve review comments