Refactored the point and matrix22