diff --git a/services/identity/src/constants.rs b/services/identity/src/constants.rs
--- a/services/identity/src/constants.rs
+++ b/services/identity/src/constants.rs
@@ -93,11 +93,11 @@
 pub mod one_time_keys_table {
   // The `PARTITION_KEY` will contain "notification_${deviceID}" or
   // "content_${deviceID}" to allow for both key sets to coexist in the same table
-  pub const NAME: &'static str = "identity-one-time-keys";
-  pub const PARTITION_KEY: &'static str = "deviceID";
-  pub const DEVICE_ID: &'static str = PARTITION_KEY;
-  pub const SORT_KEY: &'static str = "oneTimeKey";
-  pub const ONE_TIME_KEY: &'static str = SORT_KEY;
+  pub const NAME: &str = "identity-one-time-keys";
+  pub const PARTITION_KEY: &str = "deviceID";
+  pub const DEVICE_ID: &str = PARTITION_KEY;
+  pub const SORT_KEY: &str = "oneTimeKey";
+  pub const ONE_TIME_KEY: &str = SORT_KEY;
 }
 
 // Tokio
diff --git a/services/identity/src/database.rs b/services/identity/src/database.rs
--- a/services/identity/src/database.rs
+++ b/services/identity/src/database.rs
@@ -286,7 +286,7 @@
     // first read in user info, then update one_time_keys with value we
     // gave to requester
     let user_info = self
-      .get_item_from_users_table(&user_id)
+      .get_item_from_users_table(user_id)
       .await?
       .item
       .ok_or(Error::MissingItem)?;
@@ -353,11 +353,10 @@
       .to_string();
     let social_proof = keyserver
       .get(USERS_TABLE_DEVICES_MAP_SOCIAL_PROOF_ATTRIBUTE_NAME)
-      .map(|s| {
+      .and_then(|s| {
         s.to_string(USERS_TABLE_DEVICES_MAP_SOCIAL_PROOF_ATTRIBUTE_NAME)
           .ok()
       })
-      .flatten()
       .map(|s| s.to_owned());
 
     let full_content_prekey = PreKey {
@@ -380,7 +379,7 @@
       notif_one_time_key,
     };
 
-    return Ok(Some(outbound_payload));
+    Ok(Some(outbound_payload))
   }
 
   /// Will "mint" a single one time key by attempting to successfully deleting
diff --git a/services/identity/src/error.rs b/services/identity/src/error.rs
--- a/services/identity/src/error.rs
+++ b/services/identity/src/error.rs
@@ -149,7 +149,7 @@
 
 pub fn consume_error<T>(result: Result<T, Error>) {
   match result {
-    Ok(_) => return,
+    Ok(_) => (),
     Err(e) => {
       error!("{}", e);
     }