diff --git a/src/hackerbase.scm b/src/hackerbase.scm
index 5afc35c..3d470e5 100644
--- a/src/hackerbase.scm
+++ b/src/hackerbase.scm
@@ -207,13 +207,13 @@
 	  (let ()
 	    (define mls (load-mailman-lists))
 	    (values (foldl (lambda (mb ml)
-			     (members-base-merge-mailman mb ml))
+			     (mbase-merge-mailman mb ml))
 			   MB0
 			   mls)
 		    (find-mailman-list mls "internal")))
 	  (let ()
 	    (define internal-ml (load-mailman-list "internal"))
-	    (values (members-base-merge-mailman MB0 internal-ml)
+	    (values (mbase-merge-mailman MB0 internal-ml)
 		    internal-ml)))
       (values #f #f)))
 
@@ -310,12 +310,12 @@
    (print-unpaired-table MB))
   ((mlsync)
    (if (-normal-month-)
-       (mailman-sync-members internal-ml (members-base-active-emails MB))
+       (mailman-sync-members internal-ml (mbase-active-emails MB))
        (print "Mailman synchronization disabled with manually specified current month.")))
   ((mlcheck)
    (let-values (((missing surplus)
 		 (mailman-compare-members internal-ml
-					  (members-base-active-emails MB))))
+					  (mbase-active-emails MB))))
      (if (and (null? missing)
 	      (null? surplus))
 	 (print "Internal mailing list membership in sync.")
diff --git a/src/mbase.scm b/src/mbase.scm
index 58e1eb7..61d097c 100644
--- a/src/mbase.scm
+++ b/src/mbase.scm
@@ -53,9 +53,9 @@
   mbase-add-unpaired
   mbase-unpaired
 
-  members-base-active-emails
+  mbase-active-emails
 
-  members-base-merge-mailman
+  mbase-merge-mailman
   )
 
  (import scheme
@@ -97,13 +97,13 @@
 						   symlinks))
 			fss))
 		  (mb1 (ldict-reduce (make-ldict)
-				    (lambda (acc symfn mr)
-				      (ldict-set acc (ldict-ref mr 'id) mr))
-				    mb0))
+				     (lambda (acc symfn mr)
+				       (ldict-set acc (ldict-ref mr 'id) mr))
+				     mb0))
 		  (mb (ldict-reduce '()
-				   (lambda (acc id mr)
-				     (cons mr acc))
-				   mb1)))
+				    (lambda (acc id mr)
+				      (cons mr acc))
+				    mb1)))
 	     mb)))))))
 
  ;; Returns the internal members list
@@ -185,27 +185,27 @@
  ;; predicate processed by proc.
  (define (mbase-update mb pred? proc)
    (ldict-set mb
-	     'members
-	     (map (lambda (mr)
-		    (if (pred? mr)
-			(proc mr)
-			mr))
-		  (mbase-members mb))))
+	      'members
+	      (map (lambda (mr)
+		     (if (pred? mr)
+			 (proc mr)
+			 mr))
+		   (mbase-members mb))))
 
  ;; Returns dictionary with statistics about the members base.
  (define (mbase-info mb-arg)
    (let* ((members (find-members-by-predicate mb-arg brmember-usable?))
 	  (di0 (make-ldict))
 	  (di1 (ldict-set di0 'invalid
-			 (filter (compose not is-4digit-prime? brmember-id) members)))
+			  (filter (compose not is-4digit-prime? brmember-id) members)))
 	  (di2 (ldict-set di1 'active
-			 (filter brmember-active? members)))
+			  (filter brmember-active? members)))
 	  (di3 (ldict-set di2 'suspended
-			 (filter brmember-suspended? members)))
+			  (filter brmember-suspended? members)))
 	  (di4 (ldict-set di3 'students
-			 (filter brmember-student? members)))
+			  (filter brmember-student? members)))
 	  (di5 (ldict-set di4 'destroyed
-			 (filter brmember-destroyed? members)))
+			  (filter brmember-destroyed? members)))
 	  (di6 (ldict-set di5 'month (*current-month*)))
 	  (di7 (ldict-set di6 'total members)))
      di7))
@@ -234,8 +234,8 @@
  ;; Adds unpaired transaction to given members-base
  (define (mbase-add-unpaired mb tr)
    (ldict-set mb 'unpaired
-	     (cons tr
-		   (ldict-ref mb 'unpaired '()))))
+	      (cons tr
+		    (ldict-ref mb 'unpaired '()))))
 
  ;; Returns known unpaired transactions
  (define (mbase-unpaired mb)
@@ -243,7 +243,7 @@
 
  ;; Returns the list of emails of all active members sorted
  ;; alphabetically
- (define (members-base-active-emails mb)
+ (define (mbase-active-emails mb)
    (sort
     (filter
      string?
@@ -255,16 +255,16 @@
     string-ci<?))
 
  ;; Merges given ML members into members base
- (define (members-base-merge-mailman mb ml)
+ (define (mbase-merge-mailman mb ml)
    (let ((listname (car ml))
 	 (emails (cdr ml)))
      (foldl (lambda (mb email)
 	      (mbase-update mb
-				   (lambda (mr)
-				     (equal? (brmember-info mr 'mail #f)
-					     email))
-				   (lambda (mr)
-				     (brmember-add-mailman mr listname))))
+			    (lambda (mr)
+			      (equal? (brmember-info mr 'mail #f)
+				      email))
+			    (lambda (mr)
+			      (brmember-add-mailman mr listname))))
 	    mb
 	    emails)))
 
diff --git a/src/members-payments.scm b/src/members-payments.scm
index 0454025..b8446fa 100644
--- a/src/members-payments.scm
+++ b/src/members-payments.scm
@@ -180,17 +180,17 @@
  ;; Adds all balances - payments are converted to CZK in member-payments-total
  (define (member-sort-payments mr)
    (ldict-set mr
-	     'payments
-	     (sort (ldict-ref mr 'payments '())
-		   (lambda (a b)
-		     (string<? (bank-transaction-date a)
-			       (bank-transaction-date b))))))
+	      'payments
+	      (sort (ldict-ref mr 'payments '())
+		    (lambda (a b)
+		      (string<? (bank-transaction-date a)
+				(bank-transaction-date b))))))
 
-  ;; Balances totals
+ ;; Balances totals
  (define (member-balance mr)
    (make-ldict `((fees . ,(member-fees-total mr))
-		(credit . ,(member-credit-total mr))
-		(payment . ,(member-payments-total mr)))))
+		 (credit . ,(member-credit-total mr))
+		 (payment . ,(member-payments-total mr)))))
 
  ;; Computes total member balance from credit, fees and payment
  ;; information
diff --git a/src/members-print.scm b/src/members-print.scm
index 46d9f83..ae73dc6 100644
--- a/src/members-print.scm
+++ b/src/members-print.scm
@@ -233,8 +233,8 @@
 	       (map brmember-file-path pmrs)
 	       ", "))))
    (let ((pmrs (find-members-by-predicate mb (lambda (mr)
-						 (and (brmember-has-highlights? mr)
-						      (not (brmember-has-problems? mr)))))))
+					       (and (brmember-has-highlights? mr)
+						    (not (brmember-has-problems? mr)))))))
      (when (not (null? pmrs))
        (newline)
        (print "Member files with issues: "