refactoring, cleanup Vector4