Refactored VIH Commerce for clarity