Fix format
Replace point objects with strongly typed Point