better segmenter function names
Windows linebreaks for the segmenter (\r\n)
code cleanup