Refactor vendorsetup