Merge branch 'wine-inventory-reviews-update' into 'main'

Code improvement from the project reviews

See merge request !22