Refactor Vector3D