Major clean up of vector.cpp program.