Cleaned up the way vectors are loaded.