Fix from arohner's review.
Fix from arohner's review.

Use :keys with destructuring
Don't use (do) within

circleci/frontend,circleci/frontend,RayRutjes/frontend,prathamesh-sonpatki/frontend,prathamesh-sonpatki/frontend,RayRutjes/frontend,circleci/frontend