Make vendors function private
Minor reorganization