cleaned up point
more cleanups