Cleanup of Point and new functionality