refactor(MetadataExtractor): revert some minor changes