Renamed Reference to Point
Major cleanups