Update extractor and remove newline