Cleanup and added version querying in example code
Authored by: jflavoie 2021-09-28
Parent: [r93]
Child: [r95]