Apply TW suggestions to AI catalog

The following discussion from !198222 (merged) should be addressed:

• @rsarangadharan started a discussion: (+1 comment)

  Thanks @.luke. I left some suggestions. 🙇