clean up + use lines instead of points