 
   (find-accounts-by-name
     [_ entity-id name]
-    (let [sql (sql/format (-> (h/select :*)
-                              (h/from :accounts)
-                              (h/where [:and
-                                        [:= :entity_id entity-id]
-                                        [:= :name name]])))]
-      (->> (jdbc/query db-spec sql)
-          (map ->clojure-keys))))
+    (query db-spec (-> (h/select :*)
+                       (h/from :accounts)
+                       (h/where [:and
+                                 [:= :entity_id entity-id]
+                                 [:= :name name]]))))
 
   ; Transactions
   (select-transactions-by-entity-id
     [_ entity-id]
-    (let [sql (sql/format (-> (h/select :*)
-                              (h/from :transactions)
-                              (h/where [:= :entity-id entity-id])
-                              (h/order-by [:transaction-date :desc])))]
-      (->> (jdbc/query db-spec sql)
-           (map ->clojure-keys))))
+    (query db-spec (-> (h/select :*)
+                      (h/from :transactions)
+                      (h/where [:= :entity-id entity-id])
+                      (h/order-by [:transaction-date :desc]))))
 
   (create-transaction
     [_ transaction]
     (insert db-spec :transactions transaction))
 
   (find-transaction-by-id
-      [_ id]
-      (let [sql (sql/format (-> (h/select :*)
-                                (h/from :transactions)
-                                (h/where [:= :id id])
-                                (h/limit 1)))]
-        (->> (jdbc/query db-spec sql)
-            (map ->clojure-keys)
-            first)))
+    [_ id]
+    (->> (-> (h/select :*)
+            (h/from :transactions)
+            (h/where [:= :id id])
+            (h/limit 1))
+        (query db-spec )
+        first))
 
   (delete-transaction
     [_ id]


  (select-users
    [_]
    (let [sql (sql/format (-> (h/select :first_name :last_name :email)
                              (h/from :users)))]
      (->> (jdbc/query db-spec sql)
           (map ->clojure-keys))))

  (find-user-by-email
    [this email]
    (let [sql (sql/format (-> (h/select :id :first_name :last_name :email :password)
                              (h/from :users)
                              (h/where [:= :email email])))]
      (->> sql
           (jdbc/query db-spec)
           first
           ->clojure-keys)))

  (user-exists-with-email?
    [this email]


  (select-accounts-by-entity-id
    [_ entity-id]
    (query db-spec (-> (h/select :*)
                       (h/from :accounts)
                       (h/where [:= :entity_id entity-id]))))

  (update-account
    [_ account]
