diff --git a/pageserver/src/config.rs b/pageserver/src/config.rs
index 27efbbe870..e9b89830c4 100644
--- a/pageserver/src/config.rs
+++ b/pageserver/src/config.rs
@@ -391,7 +391,7 @@ impl PageServerConf {
     }
 
     pub fn tenant_attaching_mark_file_path(&self, tenant_id: &TenantId) -> PathBuf {
-        self.tenant_path(&tenant_id)
+        self.tenant_path(tenant_id)
             .join(TENANT_ATTACHING_MARKER_FILENAME)
     }
 
diff --git a/pageserver/src/storage_sync.rs b/pageserver/src/storage_sync.rs
index 310a28de49..3e3255e82a 100644
--- a/pageserver/src/storage_sync.rs
+++ b/pageserver/src/storage_sync.rs
@@ -128,8 +128,8 @@ pub mod index;
 mod upload;
 
 // re-export this
-pub use download::list_remote_timelines;
 pub use download::is_temp_download_file;
+pub use download::list_remote_timelines;
 
 use std::collections::{HashMap, VecDeque};
 use std::fmt::Debug;
diff --git a/pageserver/src/tenant/timeline.rs b/pageserver/src/tenant/timeline.rs
index 49ec64f373..04c2934a15 100644
--- a/pageserver/src/tenant/timeline.rs
+++ b/pageserver/src/tenant/timeline.rs
@@ -931,7 +931,10 @@ impl Timeline {
             } else if fname == METADATA_FILE_NAME || fname.ends_with(".old") {
                 // ignore these
             } else if crate::storage_sync::is_temp_download_file(&direntry_path) {
-                info!("skipping temp download file, reconcile_with_remote will resume / clean up: {}", fname);
+                info!(
+                    "skipping temp download file, reconcile_with_remote will resume / clean up: {}",
+                    fname
+                );
             } else if is_ephemeral_file(&fname) {
                 // Delete any old ephemeral files
                 trace!("deleting old ephemeral file in timeline dir: {}", fname);
diff --git a/pageserver/src/tenant_mgr.rs b/pageserver/src/tenant_mgr.rs
index 2a273601c6..f85d90336e 100644
--- a/pageserver/src/tenant_mgr.rs
+++ b/pageserver/src/tenant_mgr.rs
@@ -170,7 +170,7 @@ fn load_local_tenant(
         Tenant::spawn_load(conf, tenant_id, remote_storage)?
     };
     tenants_state::write_tenants().insert(tenant_id, tenant);
-    return Ok(Some(()));
+    Ok(Some(()))
 }
 
 ///