Refactoring vendor libraries.
Minor refactoring.