       (doseq [queue (keys queues-to-exchanges)
               :let [exchanges (get queues-to-exchanges queue)]]
         (bind-queue-to-exchanges sns-client sqs-client exchanges queue))
-      (assoc this :sns-client sns-client :sqs-client sqs-client
+      (assoc this
+             :sns-client sns-client
+             :sqs-client sqs-client
              :normalized-queue-names normalized-queue-names)))
 
   (stop

(defn- bind-queue-to-exchanges
 "Bind a queue to SNS Topics representing exchanges."
 [sns-client sqs-client exchange-names queue-name]
 (bind-queue-to-exchange sns-client sqs-client (first exchange-names) queue-name false)
 (doseq [exchange-name (rest exchange-names)]
   (bind-queue-to-exchange sns-client sqs-client exchange-name queue-name true)))

(defn- normalized-queue-name->original-queue-name
  "Convert a normalized queue name to the original queue name used to create it."


  (start
    [this system]
    (let [sqs-client (create-aws-client :sqs)
          sns-client (create-aws-client :sns)
          normalized-queue-names (reduce (fn [m queue-name]
                                             (let [nqn (normalize-queue-name queue-name)]
                                               (assoc m nqn queue-name)))
