 
             ;if 2 of cards are revealed, we have to check parity
             (if (and (= (revealed-cards-count) 2)
-                     (= (get @state :last-symbol)
-                        (get @card-state :symbol)))
-              (mark-match! (get @card-state :symbol)))
+                     (= (:last-symbol @state)
+                        (:symbol @card-state)))
+              (mark-match! (:symbol @card-state)))
 
             ;let's remember last symbol to make comparison in subsequent steps
-            (swap! state assoc :last-symbol (@card-state :symbol)))]
+            (swap! state assoc :last-symbol (:symbol @card-state)))]
 
     [:div.card
      {:onClick handle-card-click!

      {:class (if (@card-state :visible)
                "card-value"
                "card-value-hidden")}
      (@card-state :symbol)]]))

(defn home-page []
  [:div.pexeso

   [:button.button {:onClick start-game} "Restart game"]

   [:div.board
    (doall (for [card-state (:cards @state)]
             (card card-state)))]])

(defn current-page []
