[ExtractorHandler] code cleaning