From 76ba6f7d2bcb3b970974098af83a80750bca7b68 Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Wed, 27 Dec 2017 14:58:37 +0200
Subject: [PATCH] Refactoring

---
 pysollib/hint.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pysollib/hint.py b/pysollib/hint.py
index 09896d97..1b37e1d5 100644
--- a/pysollib/hint.py
+++ b/pysollib/hint.py
@@ -743,15 +743,18 @@ class Base_Solver_Hint:
     def config(self, **kw):
         self.options.update(kw)
 
-    def card2str1(self, card):
+    def _card2str_format(self, fmt, card):
         # row and reserves
         rank = (card.rank-self.base_rank) % 13
-        return "A23456789TJQK"[rank] + "CSHD"[card.suit]
+        return fmt % {'R': "A23456789TJQK"[rank], 'S': "CSHD"[card.suit]}
+
+    def card2str1(self, card):
+        # row and reserves
+        return self._card2str_format('%(R)s%(S)s', card)
 
     def card2str2(self, card):
         # foundations
-        rank = (card.rank-self.base_rank) % 13
-        return "CSHD"[card.suit] + "-" + "A23456789TJQK"[rank]
+        return self._card2str_format('%(S)-s%(R)s', card)
 
 # hard solvable: Freecell #47038300998351211829 (65539 iters)