diff --git a/src/bin/cashierd.rs b/src/bin/cashierd.rs
index bfdf6afbe..8c0d4e380 100644
--- a/src/bin/cashierd.rs
+++ b/src/bin/cashierd.rs
@@ -7,12 +7,12 @@ use std::{path::Path, path::PathBuf};
 use drk::blockchain::{rocks::columns, Rocks, RocksColumn};
 use drk::cli::{CashierdCli, CashierdConfig, Config};
 use drk::rpc::adapters::cashier_adapter::CashierAdapter;
+use drk::rpc::jsonserver;
 use drk::service::CashierService;
 use drk::service::GatewayClient;
 use drk::util::join_config_path;
 use drk::wallet::CashierDb;
 use drk::{Error, Result};
-use drk::rpc::jsonserver;
 use log::*;
 
 use async_executor::Executor;
diff --git a/src/rpc/adapters/cashier_adapter.rs b/src/rpc/adapters/cashier_adapter.rs
index a1dd94fdb..5637590e6 100644
--- a/src/rpc/adapters/cashier_adapter.rs
+++ b/src/rpc/adapters/cashier_adapter.rs
@@ -1,8 +1,7 @@
 use crate::wallet::CashierDb;
-use crate::{Result};
+use crate::Result;
 use async_std::sync::Arc;
 
-
 pub struct CashierAdapter {
     pub wallet: Arc<CashierDb>,
 }
@@ -12,9 +11,7 @@ impl CashierAdapter {
         Ok(Self { wallet })
     }
 
-    pub fn handle_input(
-        self: Arc<Self>,
-    ) -> Result<jsonrpc_core::IoHandler> {
+    pub fn handle_input(self: Arc<Self>) -> Result<jsonrpc_core::IoHandler> {
         let mut io = jsonrpc_core::IoHandler::new();
         io.add_sync_method("cashier_hello", |_| {
             Ok(jsonrpc_core::Value::String("hello world!".into()))
diff --git a/src/rpc/adapters/user_adapter.rs b/src/rpc/adapters/user_adapter.rs
index f244c1e7d..d08c1c200 100644
--- a/src/rpc/adapters/user_adapter.rs
+++ b/src/rpc/adapters/user_adapter.rs
@@ -42,8 +42,7 @@ impl UserAdapter {
         })
     }
 
-    pub fn handle_input(
-        self: Arc<Self>) -> Result<jsonrpc_core::IoHandler> {
+    pub fn handle_input(self: Arc<Self>) -> Result<jsonrpc_core::IoHandler> {
         let mut io = jsonrpc_core::IoHandler::new();
         io.add_sync_method("say_hello", |_| {
             Ok(jsonrpc_core::Value::String("hello world!".into()))
diff --git a/src/rpc/jsonserver.rs b/src/rpc/jsonserver.rs
index 4acbf937a..1f9d97ed9 100644
--- a/src/rpc/jsonserver.rs
+++ b/src/rpc/jsonserver.rs
@@ -115,7 +115,11 @@ impl RpcInterface {
         }))
     }
 
-    pub async fn serve(self: Arc<Self>, mut req: Request, io: Arc<jsonrpc_core::IoHandler>) -> http_types::Result<Response> {
+    pub async fn serve(
+        self: Arc<Self>,
+        mut req: Request,
+        io: Arc<jsonrpc_core::IoHandler>,
+    ) -> http_types::Result<Response> {
         info!("RPC serving {}", req.url());
 
         let request = req.body_string().await?;
diff --git a/src/service/btc.rs b/src/service/btc.rs
index f44919934..561eeb836 100644
--- a/src/service/btc.rs
+++ b/src/service/btc.rs
@@ -1,17 +1,17 @@
-use crate::{Result};
+use crate::Result;
 
 use rand::distributions::Alphanumeric;
 use rand::{thread_rng, Rng};
 
-use bitcoin::util::address::Address;
-use bitcoin::util::ecdsa::{PrivateKey, PublicKey};
-use secp256k1::key::SecretKey;
+use async_executor::Executor;
+use async_std::sync::Arc;
 use bitcoin::blockdata::script::Script;
 use bitcoin::network::constants::Network;
-use async_std::sync::Arc;
-use async_executor::Executor;
-use log::*;
+use bitcoin::util::address::Address;
+use bitcoin::util::ecdsa::{PrivateKey, PublicKey};
 use electrum_client::{Client as ElectrumClient, ElectrumApi};
+use log::*;
+use secp256k1::key::SecretKey;
 
 // Swap out these types for any future non bitcoin-rs types
 pub type PubAddress = Address;
@@ -30,7 +30,6 @@ pub struct BitcoinKeys {
 
 impl BitcoinKeys {
     pub fn new() -> Result<Arc<BitcoinKeys>> {
-
         // Pull address from config later
         let client_address = "";
 
diff --git a/src/service/cashier.rs b/src/service/cashier.rs
index 5c4201436..786932336 100644
--- a/src/service/cashier.rs
+++ b/src/service/cashier.rs
@@ -13,9 +13,9 @@ use bls12_381::Bls12;
 use ff::Field;
 use rand::rngs::OsRng;
 
-use electrum_client::{Client as ElectrumClient, ElectrumApi};
-use bitcoin::blockdata::script::Script;
 use async_executor::Executor;
+use bitcoin::blockdata::script::Script;
+use electrum_client::{Client as ElectrumClient, ElectrumApi};
 use log::*;
 
 use async_std::sync::Arc;
@@ -82,11 +82,7 @@ impl CashierService {
         let (send, recv) = protocol.start().await?;
 
         let handle_request_task =
-            executor.spawn(self.handle_request_loop(
-                send.clone(),
-                recv.clone(),
-                executor.clone()
-            ));
+            executor.spawn(self.handle_request_loop(send.clone(), recv.clone(), executor.clone()));
 
         protocol.run(executor.clone()).await?;
 
@@ -129,15 +125,17 @@ impl CashierService {
 
         Ok(())
     }
-    async fn start_subscribe(self: Arc<Self>, script: Script, executor: Arc<Executor<'_>>) -> Result<()> {
+    async fn start_subscribe(
+        self: Arc<Self>,
+        script: Script,
+        executor: Arc<Executor<'_>>,
+    ) -> Result<()> {
         debug!(target: "BTC", "Subscribe");
 
         // Check if script is already subscribed
         let status_start = self.btc_client.script_subscribe(&script).unwrap();
         let subscribe_status_task =
-            executor.spawn(
-                self.subscribe_status_loop(status_start, script, executor.clone()),
-            );
+            executor.spawn(self.subscribe_status_loop(status_start, script, executor.clone()));
         debug!(target: "BTC", "Subscribed to scripthash");
         let _ = subscribe_status_task.cancel().await;
 
@@ -154,13 +152,9 @@ impl CashierService {
             let check = self.btc_client.script_pop(&script);
             match check {
                 // Script has a notification update
-                Ok(status) => {
-
-                }
+                Ok(status) => {}
                 // No update, repeat
-                Err(_) => {
-                    break
-                }
+                Err(_) => break,
             }
         }
         Ok(())