Replace vector 6 by two vectors 3d
Fix coding style.