Apply suggestions from code reviewCo-authored-by: Elena Shmoylova <eshmoylova@users.noreply.github.com>