diff --git a/bbstool.scm b/bbstool.scm
index e30b4e4..82c2330 100644
--- a/bbstool.scm
+++ b/bbstool.scm
@@ -26,7 +26,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ")
 
 (import testing
-	(chicken format)
 	listing
 	dictionary
 	month
@@ -135,23 +134,11 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
    (print "Current month: " (month->string (*current-month*)))
    (newline)
    (if mr
-       (let* ((mc (member-calendar mr))
-	      (fees (member-calendar->fees mc)))
+       (let ()
 	 (print-member-table mr)
-	 (print (table->string (cons (map (lambda (c)
-					    (sprintf "\t~A\t" c))
-					  (list "" 1 2 3 4 5 6 7 8 9 10 11 12))
-				     (member-calendar->years-table mc))
-			       #:table-border #t
-			       #:row-border #t
-			       #:col-border #t
-			       #:ansi #t
-			       ))
-	 ;; (print fees)
-	 (print "Total fees: " (foldl + 0 fees))
-	 )
-	 (print-members-base-table MB)
-	 )
+	 (print-member-calendar-table mr)
+	 (print "Total fees: " (member-fees-total mr)))
+       (print-members-base-table MB))
    (newline))
   ((print-stats)
    (newline)
@@ -185,6 +172,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
        (loop (cdr mb)))))
   ((fees)
    (newline)
-   (print-member-fees-table MB))
+   (print-members-fees-table MB))
   
   )
diff --git a/member-fees.scm b/member-fees.scm
index 08c954b..1f56cce 100644
--- a/member-fees.scm
+++ b/member-fees.scm
@@ -37,6 +37,7 @@
   member-fees-total
   member-credit-total
   print-members-fees-table
+  print-member-calendar-table
   )
 
  (import scheme
@@ -164,5 +165,20 @@
 	       ))
        (sort (filter-members-by-predicate MB member-active?) member<?)))
      #:col-border #t #:row0-border #t)))
+
+ ;; Nicely print calendar for given member
+ (define (print-member-calendar-table mr)
+   (let* ((mc (member-calendar mr))
+	      (fees (member-calendar->fees mc)))
+	 (print (table->string (cons (map (lambda (c)
+					    (sprintf "\t~A\t" c))
+					  (list "" 1 2 3 4 5 6 7 8 9 10 11 12))
+				     (member-calendar->years-table mc))
+			       #:table-border #t
+			       #:row-border #t
+			       #:col-border #t
+			       #:ansi #t
+			       ))
+	 ))
  
  )