Finish VECTOR and POINT refactoring