diff --git a/meilisearch-core/benches/search_benchmark.rs b/meilisearch-core/benches/search_benchmark.rs
index e25245468..73a39780d 100644
--- a/meilisearch-core/benches/search_benchmark.rs
+++ b/meilisearch-core/benches/search_benchmark.rs
@@ -39,7 +39,7 @@ fn prepare_database(path: &Path) -> Database {
         let file = File::open(path).unwrap();
         let reader = BufReader::new(file);
         let settings: Settings = serde_json::from_reader(reader).unwrap();
-        settings.into_update().unwrap()
+        settings.to_update().unwrap()
     };
 
     db.update_write::<_, _, Box<dyn Error>>(|writer| {
diff --git a/meilisearch-core/examples/from_file.rs b/meilisearch-core/examples/from_file.rs
index af41efb6c..a64e2b626 100644
--- a/meilisearch-core/examples/from_file.rs
+++ b/meilisearch-core/examples/from_file.rs
@@ -123,7 +123,7 @@ fn index_command(command: IndexCommand, database: Database) -> Result<(), Box<dy
     let settings = {
         let string = fs::read_to_string(&command.settings)?;
         let settings: Settings = serde_json::from_str(&string).unwrap();
-        settings.into_update().unwrap()
+        settings.to_update().unwrap()
     };
 
     db.update_write(|w| index.settings_update(w, settings))?;
diff --git a/meilisearch-core/src/bucket_sort.rs b/meilisearch-core/src/bucket_sort.rs
index a4bce2503..87f518868 100644
--- a/meilisearch-core/src/bucket_sort.rs
+++ b/meilisearch-core/src/bucket_sort.rs
@@ -19,7 +19,7 @@ use crate::criterion::{Criteria, Context, ContextMut};
 use crate::distinct_map::{BufferedDistinctMap, DistinctMap};
 use crate::raw_document::RawDocument;
 use crate::{database::MainT, reordered_attrs::ReorderedAttrs};
-use crate::{store, Document, DocumentId, MResult};
+use crate::{Document, DocumentId, MResult, Index};
 use crate::query_tree::{create_query_tree, traverse_query_tree};
 use crate::query_tree::{Operation, QueryResult, QueryKind, QueryId, PostingsKey};
 use crate::query_tree::Context as QTContext;
@@ -33,6 +33,7 @@ pub struct SortResult {
     pub exhaustive_facets_count: Option<bool>,
 }
 
+#[allow(clippy::too_many_arguments)]
 pub fn bucket_sort<'c, FI>(
     reader: &heed::RoTxn<MainT>,
     query: &str,
@@ -42,12 +43,7 @@ pub fn bucket_sort<'c, FI>(
     filter: Option<FI>,
     criteria: Criteria<'c>,
     searchable_attrs: Option<ReorderedAttrs>,
-    main_store: store::Main,
-    postings_lists_store: store::PostingsLists,
-    documents_fields_counts_store: store::DocumentsFieldsCounts,
-    synonyms_store: store::Synonyms,
-    prefix_documents_cache_store: store::PrefixDocumentsCache,
-    prefix_postings_lists_cache_store: store::PrefixPostingsListsCache,
+    index: &Index,
 ) -> MResult<SortResult>
 where
     FI: Fn(DocumentId) -> bool,
@@ -68,26 +64,21 @@ where
             distinct_size,
             criteria,
             searchable_attrs,
-            main_store,
-            postings_lists_store,
-            documents_fields_counts_store,
-            synonyms_store,
-            prefix_documents_cache_store,
-            prefix_postings_lists_cache_store,
+            index,
         );
     }
 
     let mut result = SortResult::default();
 
-    let words_set = main_store.words_fst(reader)?;
-    let stop_words = main_store.stop_words_fst(reader)?;
+    let words_set = index.main.words_fst(reader)?;
+    let stop_words = index.main.stop_words_fst(reader)?;
 
     let context = QTContext {
         words_set,
         stop_words,
-        synonyms: synonyms_store,
-        postings_lists: postings_lists_store,
-        prefix_postings_lists: prefix_postings_lists_cache_store,
+        synonyms: index.synonyms,
+        postings_lists: index.postings_lists,
+        prefix_postings_lists: index.prefix_postings_lists_cache,
     };
 
     let (operation, mapping) = create_query_tree(reader, &context, query)?;
@@ -156,7 +147,7 @@ where
                 reader,
                 postings_lists: &mut arena,
                 query_mapping: &mapping,
-                documents_fields_counts_store,
+                documents_fields_counts_store: index.documents_fields_counts,
             };
 
             criterion.prepare(ctx, &mut group)?;
@@ -189,7 +180,7 @@ where
     debug!("criterion loop took {:.02?}", before_criterion_loop.elapsed());
     debug!("proximity evaluation called {} times", proximity_count.load(Ordering::Relaxed));
 
-    let schema = main_store.schema(reader)?.ok_or(Error::SchemaMissing)?;
+    let schema = index.main.schema(reader)?.ok_or(Error::SchemaMissing)?;
     let iter = raw_documents.into_iter().skip(range.start).take(range.len());
     let iter = iter.map(|rd| Document::from_raw(rd, &queries_kinds, &arena, searchable_attrs.as_ref(), &schema));
     let documents = iter.collect();
@@ -202,6 +193,7 @@ where
     Ok(result)
 }
 
+#[allow(clippy::too_many_arguments)]
 pub fn bucket_sort_with_distinct<'c, FI, FD>(
     reader: &heed::RoTxn<MainT>,
     query: &str,
@@ -213,12 +205,7 @@ pub fn bucket_sort_with_distinct<'c, FI, FD>(
     distinct_size: usize,
     criteria: Criteria<'c>,
     searchable_attrs: Option<ReorderedAttrs>,
-    main_store: store::Main,
-    postings_lists_store: store::PostingsLists,
-    documents_fields_counts_store: store::DocumentsFieldsCounts,
-    synonyms_store: store::Synonyms,
-    _prefix_documents_cache_store: store::PrefixDocumentsCache,
-    prefix_postings_lists_cache_store: store::PrefixPostingsListsCache,
+    index: &Index,
 ) -> MResult<SortResult>
 where
     FI: Fn(DocumentId) -> bool,
@@ -226,15 +213,15 @@ where
 {
     let mut result = SortResult::default();
 
-    let words_set = main_store.words_fst(reader)?;
-    let stop_words = main_store.stop_words_fst(reader)?;
+    let words_set = index.main.words_fst(reader)?;
+    let stop_words = index.main.stop_words_fst(reader)?;
 
     let context = QTContext {
         words_set,
         stop_words,
-        synonyms: synonyms_store,
-        postings_lists: postings_lists_store,
-        prefix_postings_lists: prefix_postings_lists_cache_store,
+        synonyms: index.synonyms,
+        postings_lists: index.postings_lists,
+        prefix_postings_lists: index.prefix_postings_lists_cache,
     };
 
     let (operation, mapping) = create_query_tree(reader, &context, query)?;
@@ -313,7 +300,7 @@ where
                 reader,
                 postings_lists: &mut arena,
                 query_mapping: &mapping,
-                documents_fields_counts_store,
+                documents_fields_counts_store: index.documents_fields_counts,
             };
 
             let before_criterion_preparation = Instant::now();
@@ -378,7 +365,7 @@ where
     // once we classified the documents related to the current
     // automatons we save that as the next valid result
     let mut seen = BufferedDistinctMap::new(&mut distinct_map);
-    let schema = main_store.schema(reader)?.ok_or(Error::SchemaMissing)?;
+    let schema = index.main.schema(reader)?.ok_or(Error::SchemaMissing)?;
 
     let mut documents = Vec::with_capacity(range.len());
     for raw_document in raw_documents.into_iter().skip(distinct_raw_offset) {
diff --git a/meilisearch-core/src/criterion/mod.rs b/meilisearch-core/src/criterion/mod.rs
index d5c291618..a2f68c28e 100644
--- a/meilisearch-core/src/criterion/mod.rs
+++ b/meilisearch-core/src/criterion/mod.rs
@@ -92,6 +92,7 @@ impl<'a> CriteriaBuilder<'a> {
         self.inner.reserve(additional)
     }
 
+    #[allow(clippy::should_implement_trait)]
     pub fn add<C: 'a>(mut self, criterion: C) -> CriteriaBuilder<'a>
     where
         C: Criterion,
diff --git a/meilisearch-core/src/criterion/typo.rs b/meilisearch-core/src/criterion/typo.rs
index ca3f6212e..4b9fdea1d 100644
--- a/meilisearch-core/src/criterion/typo.rs
+++ b/meilisearch-core/src/criterion/typo.rs
@@ -22,6 +22,7 @@ impl Criterion for Typo {
         // It is safe to panic on input number higher than 3,
         // the number of typos is never bigger than that.
         #[inline]
+        #[allow(clippy::approx_constant)]
         fn custom_log10(n: u8) -> f32 {
             match n {
                 0 => 0.0,     // log(1)
diff --git a/meilisearch-core/src/database.rs b/meilisearch-core/src/database.rs
index 79a1e430c..71273f803 100644
--- a/meilisearch-core/src/database.rs
+++ b/meilisearch-core/src/database.rs
@@ -82,8 +82,7 @@ fn update_awaiter(
     update_fn: Arc<ArcSwapFn>,
     index: Index,
 ) -> MResult<()> {
-    let mut receiver = receiver.into_iter();
-    while let Some(event) = receiver.next() {
+    for event in receiver {
 
         // if we receive a *MustClear* event, clear the index and break the loop
         if let UpdateEvent::MustClear = event {
@@ -547,7 +546,7 @@ mod tests {
                 }
             "#;
             let settings: Settings = serde_json::from_str(data).unwrap();
-            settings.into_update().unwrap()
+            settings.to_update().unwrap()
         };
 
         let mut update_writer = db.update_write_txn().unwrap();
@@ -610,7 +609,7 @@ mod tests {
                 }
             "#;
             let settings: Settings = serde_json::from_str(data).unwrap();
-            settings.into_update().unwrap()
+            settings.to_update().unwrap()
         };
 
         let mut update_writer = db.update_write_txn().unwrap();
@@ -672,7 +671,7 @@ mod tests {
                 }
             "#;
             let settings: Settings = serde_json::from_str(data).unwrap();
-            settings.into_update().unwrap()
+            settings.to_update().unwrap()
         };
 
         let mut update_writer = db.update_write_txn().unwrap();
@@ -727,7 +726,7 @@ mod tests {
                 }
             "#;
             let settings: Settings = serde_json::from_str(data).unwrap();
-            settings.into_update().unwrap()
+            settings.to_update().unwrap()
         };
 
         let mut update_writer = db.update_write_txn().unwrap();
@@ -763,7 +762,7 @@ mod tests {
                 }
             "#;
             let settings: Settings = serde_json::from_str(data).unwrap();
-            settings.into_update().unwrap()
+            settings.to_update().unwrap()
         };
 
         let mut writer = db.update_write_txn().unwrap();
@@ -829,7 +828,7 @@ mod tests {
                 }
             "#;
             let settings: Settings = serde_json::from_str(data).unwrap();
-            settings.into_update().unwrap()
+            settings.to_update().unwrap()
         };
 
         let mut writer = db.update_write_txn().unwrap();
@@ -871,7 +870,7 @@ mod tests {
                 }
             "#;
             let settings: Settings = serde_json::from_str(data).unwrap();
-            settings.into_update().unwrap()
+            settings.to_update().unwrap()
         };
 
         let mut writer = db.update_write_txn().unwrap();
@@ -951,7 +950,7 @@ mod tests {
                 }
             "#;
             let settings: Settings = serde_json::from_str(data).unwrap();
-            settings.into_update().unwrap()
+            settings.to_update().unwrap()
         };
 
         let mut writer = db.update_write_txn().unwrap();
@@ -1090,7 +1089,7 @@ mod tests {
                 }
             "#;
             let settings: Settings = serde_json::from_str(data).unwrap();
-            settings.into_update().unwrap()
+            settings.to_update().unwrap()
         };
 
         let mut writer = db.update_write_txn().unwrap();
@@ -1166,7 +1165,7 @@ mod tests {
                 }
             "#;
             let settings: Settings = serde_json::from_str(data).unwrap();
-            settings.into_update().unwrap()
+            settings.to_update().unwrap()
         };
 
         let mut writer = db.update_write_txn().unwrap();
diff --git a/meilisearch-core/src/facets.rs b/meilisearch-core/src/facets.rs
index 2f632dd94..1295224b7 100644
--- a/meilisearch-core/src/facets.rs
+++ b/meilisearch-core/src/facets.rs
@@ -70,7 +70,7 @@ impl FacetFilter {
                         bad_value => return Err(FacetError::unexpected_token(&["Array", "String"], bad_value).into()),
                     }
                 }
-                return Ok(Self(filter));
+                Ok(Self(filter))
             }
             bad_value => Err(FacetError::unexpected_token(&["Array"], bad_value).into()),
         }
diff --git a/meilisearch-core/src/filters/condition.rs b/meilisearch-core/src/filters/condition.rs
index 0045e410f..d22f9d905 100644
--- a/meilisearch-core/src/filters/condition.rs
+++ b/meilisearch-core/src/filters/condition.rs
@@ -31,7 +31,7 @@ struct ConditionValue<'a> {
 
 impl<'a> ConditionValue<'a> {
     pub fn new(value: &Pair<'a, Rule>) -> Self {
-        let value = match value.as_rule() {
+        match value.as_rule() {
             Rule::string | Rule::word => {
                 let string =  value.as_str();
                 let boolean = match value.as_str() {
@@ -43,12 +43,11 @@ impl<'a> ConditionValue<'a> {
                 ConditionValue { string, boolean, number }
             },
             _ => unreachable!(),
-        };
-        value
+        }
     }
 
     pub fn as_str(&self) -> &str {
-        self.string.as_ref()
+        self.string
     }
 
     pub fn as_number(&self) -> Option<&Number> {
@@ -73,7 +72,7 @@ fn get_field_value<'a>(schema: &Schema, pair: Pair<'a, Rule>) -> Result<(FieldId
     let key = items.next().unwrap();
     let field = schema
         .id(key.as_str())
-        .ok_or::<PestError<Rule>>(PestError::new_from_span(
+        .ok_or_else(|| PestError::new_from_span(
                 ErrorVariant::CustomError {
                     message: format!(
                                  "attribute `{}` not found, available attributes are: {}",
diff --git a/meilisearch-core/src/filters/mod.rs b/meilisearch-core/src/filters/mod.rs
index cbff79f37..ea2090a09 100644
--- a/meilisearch-core/src/filters/mod.rs
+++ b/meilisearch-core/src/filters/mod.rs
@@ -26,7 +26,7 @@ pub enum Filter<'a> {
 
 impl<'a> Filter<'a> {
     pub fn parse(expr: &'a str, schema: &'a Schema) -> FilterResult<'a> {
-        let mut lexed = FilterParser::parse(Rule::prgm, expr.as_ref())?;
+        let mut lexed = FilterParser::parse(Rule::prgm, expr)?;
         Self::build(lexed.next().unwrap().into_inner(), schema)
     }
 
diff --git a/meilisearch-core/src/lib.rs b/meilisearch-core/src/lib.rs
index e468a794e..bcdad62b1 100644
--- a/meilisearch-core/src/lib.rs
+++ b/meilisearch-core/src/lib.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::type_complexity)]
+
 #[cfg(test)]
 #[macro_use]
 extern crate assert_matches;
diff --git a/meilisearch-core/src/number.rs b/meilisearch-core/src/number.rs
index a9b2e606d..38f7ca975 100644
--- a/meilisearch-core/src/number.rs
+++ b/meilisearch-core/src/number.rs
@@ -6,7 +6,7 @@ use std::str::FromStr;
 use ordered_float::OrderedFloat;
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize, Debug, Copy, Clone, Hash)]
+#[derive(Serialize, Deserialize, Debug, Copy, Clone)]
 pub enum Number {
     Unsigned(u64),
     Signed(i64),
diff --git a/meilisearch-core/src/query_builder.rs b/meilisearch-core/src/query_builder.rs
index 72accfcde..cb1c85da7 100644
--- a/meilisearch-core/src/query_builder.rs
+++ b/meilisearch-core/src/query_builder.rs
@@ -152,12 +152,7 @@ impl<'c, 'f, 'd, 'i> QueryBuilder<'c, 'f, 'd, 'i> {
                 distinct_size,
                 self.criteria,
                 self.searchable_attrs,
-                self.index.main,
-                self.index.postings_lists,
-                self.index.documents_fields_counts,
-                self.index.synonyms,
-                self.index.prefix_documents_cache,
-                self.index.prefix_postings_lists_cache,
+                self.index,
             ),
             None => bucket_sort(
                 reader,
@@ -168,12 +163,7 @@ impl<'c, 'f, 'd, 'i> QueryBuilder<'c, 'f, 'd, 'i> {
                 self.filter,
                 self.criteria,
                 self.searchable_attrs,
-                self.index.main,
-                self.index.postings_lists,
-                self.index.documents_fields_counts,
-                self.index.synonyms,
-                self.index.prefix_documents_cache,
-                self.index.prefix_postings_lists_cache,
+                self.index,
             ),
         }
     }
diff --git a/meilisearch-core/src/query_words_mapper.rs b/meilisearch-core/src/query_words_mapper.rs
index b9816a347..7ff07b459 100644
--- a/meilisearch-core/src/query_words_mapper.rs
+++ b/meilisearch-core/src/query_words_mapper.rs
@@ -19,6 +19,7 @@ impl QueryWordsMapper {
         QueryWordsMapper { originals, mappings: HashMap::new() }
     }
 
+    #[allow(clippy::len_zero)]
     pub fn declare<I, A>(&mut self, range: Range<usize>, id: QueryId, replacement: I)
     where I: IntoIterator<Item = A>,
           A: ToString,
@@ -53,7 +54,7 @@ impl QueryWordsMapper {
         }
 
         {
-            let replacement = replacement[common_left..replacement.len() - common_right].iter().cloned().collect();
+            let replacement = replacement[common_left..replacement.len() - common_right].to_vec();
             self.mappings.insert(id + common_left, (range.clone(), replacement));
         }
 
diff --git a/meilisearch-core/src/settings.rs b/meilisearch-core/src/settings.rs
index 05e6117f0..157b88251 100644
--- a/meilisearch-core/src/settings.rs
+++ b/meilisearch-core/src/settings.rs
@@ -10,8 +10,7 @@ use self::RankingRule::*;
 pub const DEFAULT_RANKING_RULES: [RankingRule; 6] = [Typo, Words, Proximity, Attribute, WordsPosition, Exactness];
 
 static RANKING_RULE_REGEX: Lazy<regex::Regex> = Lazy::new(|| {
-    let regex = regex::Regex::new(r"(asc|desc)\(([a-zA-Z0-9-_]*)\)").unwrap();
-    regex
+    regex::Regex::new(r"(asc|desc)\(([a-zA-Z0-9-_]*)\)").unwrap()
 });
 
 #[derive(Default, Clone, Serialize, Deserialize)]
@@ -44,11 +43,11 @@ fn deserialize_some<'de, T, D>(deserializer: D) -> Result<Option<T>, D::Error>
 }
 
 impl Settings {
-    pub fn into_update(&self) -> Result<SettingsUpdate, RankingRuleConversionError> {
+    pub fn to_update(&self) -> Result<SettingsUpdate, RankingRuleConversionError> {
         let settings = self.clone();
 
         let ranking_rules = match settings.ranking_rules {
-            Some(Some(rules)) => UpdateState::Update(RankingRule::from_iter(rules.iter())?),
+            Some(Some(rules)) => UpdateState::Update(RankingRule::try_from_iter(rules.iter())?),
             Some(None) => UpdateState::Clear,
             None => UpdateState::Nothing,
         };
@@ -152,7 +151,7 @@ impl RankingRule {
         }
     }
 
-    pub fn from_iter(rules: impl IntoIterator<Item = impl AsRef<str>>) -> Result<Vec<RankingRule>, RankingRuleConversionError> {
+    pub fn try_from_iter(rules: impl IntoIterator<Item = impl AsRef<str>>) -> Result<Vec<RankingRule>, RankingRuleConversionError> {
         rules.into_iter()
             .map(|s| RankingRule::from_str(s.as_ref()))
             .collect()
diff --git a/meilisearch-core/src/store/main.rs b/meilisearch-core/src/store/main.rs
index 9d5e95425..db3c61dcf 100644
--- a/meilisearch-core/src/store/main.rs
+++ b/meilisearch-core/src/store/main.rs
@@ -287,10 +287,10 @@ impl Main {
     }
 
     pub fn distinct_attribute(&self, reader: &heed::RoTxn<MainT>) -> MResult<Option<FieldId>> {
-        if let Some(value) = self.main.get::<_, Str, OwnedType<u16>>(reader, DISTINCT_ATTRIBUTE_KEY)? {
-            return Ok(Some(FieldId(value.to_owned())))
+        match self.main.get::<_, Str, OwnedType<u16>>(reader, DISTINCT_ATTRIBUTE_KEY)? {
+            Some(value) => Ok(Some(FieldId(value.to_owned()))),
+            None => Ok(None),
         }
-        return Ok(None)
     }
 
     pub fn put_distinct_attribute(self, writer: &mut heed::RwTxn<MainT>, value: FieldId) -> MResult<()> {
diff --git a/meilisearch-core/src/update/documents_addition.rs b/meilisearch-core/src/update/documents_addition.rs
index 350f5dd35..103b5c923 100644
--- a/meilisearch-core/src/update/documents_addition.rs
+++ b/meilisearch-core/src/update/documents_addition.rs
@@ -109,6 +109,7 @@ pub fn push_documents_addition<D: serde::Serialize>(
     Ok(last_update_id)
 }
 
+#[allow(clippy::too_many_arguments)]
 fn index_document<A>(
     writer: &mut heed::RwTxn<MainT>,
     documents_fields: DocumentsFields,
diff --git a/meilisearch-core/src/update/mod.rs b/meilisearch-core/src/update/mod.rs
index 0a71f1b45..d76649367 100644
--- a/meilisearch-core/src/update/mod.rs
+++ b/meilisearch-core/src/update/mod.rs
@@ -72,7 +72,7 @@ impl Update {
 
     fn settings(data: SettingsUpdate) -> Update {
         Update {
-            data: UpdateData::Settings(data),
+            data: UpdateData::Settings(Box::new(data)),
             enqueued_at: Utc::now(),
         }
     }
@@ -85,7 +85,7 @@ pub enum UpdateData {
     DocumentsAddition(Vec<IndexMap<String, Value>>),
     DocumentsPartial(Vec<IndexMap<String, Value>>),
     DocumentsDeletion(Vec<String>),
-    Settings(SettingsUpdate)
+    Settings(Box<SettingsUpdate>)
 }
 
 impl UpdateData {
@@ -117,7 +117,7 @@ pub enum UpdateType {
     DocumentsAddition { number: usize },
     DocumentsPartial { number: usize },
     DocumentsDeletion { number: usize },
-    Settings { settings: SettingsUpdate },
+    Settings { settings: Box<SettingsUpdate> },
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -273,7 +273,7 @@ pub fn update_task<'a, 'b>(
             let result = apply_settings_update(
                 writer,
                 index,
-                settings,
+                *settings,
             );
 
             (update_type, result, start.elapsed())
diff --git a/meilisearch-error/src/lib.rs b/meilisearch-error/src/lib.rs
index 368a24b2c..a6b4cbb3a 100644
--- a/meilisearch-error/src/lib.rs
+++ b/meilisearch-error/src/lib.rs
@@ -26,6 +26,7 @@ pub trait ErrorCode: std::error::Error {
     }
 }
 
+#[allow(clippy::enum_variant_names)]
 enum ErrorType {
     InternalError,
     InvalidRequestError,
diff --git a/meilisearch-http/src/helpers/authentication.rs b/meilisearch-http/src/helpers/authentication.rs
index 927665ffe..972f3880e 100644
--- a/meilisearch-http/src/helpers/authentication.rs
+++ b/meilisearch-http/src/helpers/authentication.rs
@@ -43,6 +43,7 @@ pub struct LoggingMiddleware<S> {
     service: Rc<RefCell<S>>,
 }
 
+#[allow(clippy::type_complexity)]
 impl<S, B> Service for LoggingMiddleware<S>
 where
     S: Service<Request = ServiceRequest, Response = ServiceResponse<B>, Error = actix_web::Error> + 'static,
diff --git a/meilisearch-http/src/option.rs b/meilisearch-http/src/option.rs
index 264e33253..f8d9170b1 100644
--- a/meilisearch-http/src/option.rs
+++ b/meilisearch-http/src/option.rs
@@ -161,7 +161,7 @@ fn load_private_key(filename: PathBuf) -> Result<rustls::PrivateKey, Box<dyn err
 fn load_ocsp(filename: &Option<PathBuf>) -> Result<Vec<u8>, Box<dyn error::Error>> {
     let mut ret = Vec::new();
 
-    if let &Some(ref name) = filename {
+    if let Some(ref name) = filename {
         fs::File::open(name)
             .map_err(|_| "cannot open ocsp file")?
             .read_to_end(&mut ret)
diff --git a/meilisearch-http/src/routes/search.rs b/meilisearch-http/src/routes/search.rs
index 9fff7d6d2..beffd8fd6 100644
--- a/meilisearch-http/src/routes/search.rs
+++ b/meilisearch-http/src/routes/search.rs
@@ -188,12 +188,10 @@ impl SearchQuery {
                     for attr in &restricted_attributes {
                         final_attributes.insert(attr.to_string());
                     }
+                } else if available_attributes.contains(attribute) {
+                    final_attributes.insert(attribute.to_string());
                 } else {
-                    if available_attributes.contains(attribute) {
-                        final_attributes.insert(attribute.to_string());
-                    } else {
-                        warn!("The attributes {:?} present in attributesToHighlight parameter doesn't exist", attribute);
-                    }
+                    warn!("The attributes {:?} present in attributesToHighlight parameter doesn't exist", attribute);
                 }
             }
 
@@ -246,6 +244,6 @@ fn prepare_facet_list(facets: &str, schema: &Schema, facet_attrs: &[FieldId]) ->
             }
             Ok(field_ids)
         }
-        bad_val => return Err(FacetCountError::unexpected_token(bad_val, &["[String]"]))
+        bad_val => Err(FacetCountError::unexpected_token(bad_val, &["[String]"]))
     }
 }
diff --git a/meilisearch-http/src/routes/setting.rs b/meilisearch-http/src/routes/setting.rs
index 299bbc757..3d22af194 100644
--- a/meilisearch-http/src/routes/setting.rs
+++ b/meilisearch-http/src/routes/setting.rs
@@ -45,7 +45,7 @@ async fn update_all(
     let update_id = data.db.update_write::<_, _, ResponseError>(|writer| {
         let settings = body
             .into_inner()
-            .into_update()
+            .to_update()
             .map_err(Error::bad_request)?;
         let update_id = index.settings_update(writer, settings)?;
         Ok(update_id)
@@ -211,7 +211,7 @@ async fn update_rules(
         ..Settings::default()
     };
 
-    let settings = settings.into_update().map_err(Error::bad_request)?;
+    let settings = settings.to_update().map_err(Error::bad_request)?;
     let update_id = data.db.update_write(|w| index.settings_update(w, settings))?;
 
     Ok(HttpResponse::Accepted().json(IndexUpdateResponse::with_id(update_id)))
@@ -282,7 +282,7 @@ async fn update_distinct(
         ..Settings::default()
     };
 
-    let settings = settings.into_update().map_err(Error::bad_request)?;
+    let settings = settings.to_update().map_err(Error::bad_request)?;
     let update_id = data.db.update_write(|w| index.settings_update(w, settings))?;
 
     Ok(HttpResponse::Accepted().json(IndexUpdateResponse::with_id(update_id)))
@@ -350,7 +350,7 @@ async fn update_searchable(
         ..Settings::default()
     };
 
-    let settings = settings.into_update().map_err(Error::bad_request)?;
+    let settings = settings.to_update().map_err(Error::bad_request)?;
 
     let update_id = data.db.update_write(|w| index.settings_update(w, settings))?;
 
@@ -421,7 +421,7 @@ async fn update_displayed(
         ..Settings::default()
     };
 
-    let settings = settings.into_update().map_err(Error::bad_request)?;
+    let settings = settings.to_update().map_err(Error::bad_request)?;
     let update_id = data.db.update_write(|w| index.settings_update(w, settings))?;
 
     Ok(HttpResponse::Accepted().json(IndexUpdateResponse::with_id(update_id)))
@@ -490,7 +490,7 @@ async fn update_accept_new_fields(
         ..Settings::default()
     };
 
-    let settings = settings.into_update().map_err(Error::bad_request)?;
+    let settings = settings.to_update().map_err(Error::bad_request)?;
     let update_id = data.db.update_write(|w| index.settings_update(w, settings))?;
 
     Ok(HttpResponse::Accepted().json(IndexUpdateResponse::with_id(update_id)))
@@ -549,7 +549,7 @@ async fn update_attributes_for_faceting(
         ..Settings::default()
     };
 
-    let settings = settings.into_update().map_err(Error::bad_request)?;
+    let settings = settings.to_update().map_err(Error::bad_request)?;
     let update_id = data.db.update_write(|w| index.settings_update(w, settings))?;
 
     Ok(HttpResponse::Accepted().json(IndexUpdateResponse::with_id(update_id)))
diff --git a/meilisearch-schema/src/schema.rs b/meilisearch-schema/src/schema.rs
index 7645ae50b..7579234dd 100644
--- a/meilisearch-schema/src/schema.rs
+++ b/meilisearch-schema/src/schema.rs
@@ -2,7 +2,7 @@ use crate::{FieldsMap, FieldId, SResult, Error, IndexedPos};
 use serde::{Serialize, Deserialize};
 use std::collections::{HashMap, HashSet};
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize, Default)]
 pub struct Schema {
     fields_map: FieldsMap,
 
@@ -19,13 +19,8 @@ pub struct Schema {
 impl Schema {
     pub fn new() -> Schema {
         Schema {
-            fields_map: FieldsMap::default(),
-            primary_key: None,
-            ranked: HashSet::new(),
-            displayed: HashSet::new(),
-            indexed: Vec::new(),
-            indexed_map: HashMap::new(),
             accept_new_fields: true,
+            ..Default::default()
         }
     }