Update imports
Use ExtractorParams
Drop some newlines
Preallocate some variables
Make "trim" configurable
Update / change paths