A little clean up and let point2's hash themselves though probably not really necessary