diff --git a/src/markam.scm b/src/markam.scm
index 028a364..0079f64 100644
--- a/src/markam.scm
+++ b/src/markam.scm
@@ -23,66 +23,66 @@
 
 (declare (uses paths
                common))
-#+chicken-script
-(begin
-  (load "paths")
-  (load "common"))
 
 (require-extension sqlite3)
 (require-library posix srfi-4)
 
 (define version "0.1.0")
 
+;; If STR contains a \0 byte at the end, remove it, otherwise return
+;; STR unchanged.
 (: string-no-null (string -> string))
 (define (string-no-null str)
-  ;; If STR contains a \0 byte at the end, remove it, otherwise return
-  ;; STR unchanged.
   (if (and (> (string-length str) 0)
            (char=? (string-ref str (- (string-length str) 1)) #\nul))
       (substring str 0 (- (string-length str) 1))
       str))
 
+;; Print URL, SECONDS, NAME and DESCRIPTION to the standard output
+;; stream.
 (: print-row (string fixnum string string -> void))
 (define (print-row url seconds name description)
-  ;; Print URL, SECONDS, NAME and DESCRIPTION to the standard output
-  ;; stream.
-  (format #t "~a~%  ~a~%  ~a~%  ~a~%~%" (string-no-null name) (string-no-null description)
-          (string-no-null url) (seconds->string seconds)))
+  (format #t "~a~%  ~a~%  ~a~%  ~a~%~%" (string-no-null name)
+          (string-no-null description) (string-no-null url)
+          (seconds->string seconds)))
 
+;; Add NAME to the `tag' table in DB.
 (define (add-tag db name)
-  ;; Add NAME to the `tag' table in DB.
   (execute db "INSERT INTO tag VALUES (?)" name)
   (last-insert-rowid db))
 
+;; Add a bookmark to the `bookmark' table in DB. URL is the url of the
+;; bookmark, NAME the title, DESCRIPTION a (possibly longer)
+;; description of the bookmark and TAGS is a list of tags to assign to
+;; it. Each tag will be created if necessary.
 (define (add-bookmark db url name description tags)
-  ;; Add a bookmark to the `bookmark' table in DB.  URL is the url of
-  ;; the bookmark, NAME the title, DESCRIPTION a (possibly longer)
-  ;; description of the bookmark and TAGS is a list of tags to assign
-  ;; to it.  Each tag will be created if necessary.
   (execute db "INSERT INTO bookmark VALUES (?, STRFTIME('%s'), ?, ?)"
            url name description)
   (let ((bookmark-id (last-insert-rowid db)))
     (for-each (lambda (tag)
                 (let ((tag-id '()))
                   (condition-case
-                   (set! tag-id (first-result db "SELECT rowid FROM tag WHERE name = ?" tag))
+                   (set! tag-id
+                         (first-result
+                          db "SELECT rowid FROM tag WHERE name = ?" tag))
                    (exn (exn sqlite3)
-                        (if (eq? (get-condition-property exn 'sqlite3 'status) 'done)
+                        (if (eq? (get-condition-property
+                                  exn 'sqlite3 'status) 'done)
                             (set! tag-id (add-tag db tag))
                             (signal exn))))
                   (execute db "INSERT INTO bookmark_tag VALUES (?, ?)"
                            bookmark-id tag-id)))
               tags)))
 
+;; Is STR a URL? Very naïve, assumes all URLs begin with either
+;; `http://' or `https://', should be improved.
 (define (url-string? str)
-  ;; Is STR a URL?  Very naïve, assumes all URLs begin with either
-  ;; `http://' or `https://', should be improved.
   (and (> (string-length str) 7)
        (or (string= (substring str 0 7) "http://")
            (string= (substring str 0 8) "https://"))))
 
+;; Display markam's help message.
 (define (display-help)
-  ;; Display markam's help message.
   (format #t (string-append
               "Usage: markam [options]...~%"
               "       markam <url> <name> <description> [<tag>...]~%"
@@ -92,30 +92,36 @@
               "--help, -h     Display this help and exit~%"
               "--version, -v  Output version information and exit~%")))
 
+;; Parse command-line arguments
+(define (handle-regular-args args)
+  (do ((arg (car args) (and (not (null? args))
+                            (car args))))
+      ((or (null? arg) (not arg)))
+    (cond
+     ((or (string= arg "-v") (string= arg "--version"))
+      (display-version)
+      (exit 0))
+     ((or (string= arg "-h") (string= arg "--help"))
+      (display-help)
+      (exit 0))
+     (else
+      (format #t "Unrecognized option: ~a~%" (car args))))
+    (set! args (cdr args))))
+
+;; Open a database connection, list bookmarks, create a bookmark or
+;; pass arguments on to `handle-regular-args'.
 (define (main args)
-  ;; Open a database connection, do what the user asked and close it
-  ;; again.
   (let ((db (open-database (data-file "markam.db"))))
-    (if (null? args)
-        (for-each-row print-row db "select * from bookmark")
-        (if (url-string? (car args))
-            (with-transaction
-             db (lambda () (add-bookmark db (car args) (cadr args) (caddr args) (cdddr args)) #t))
-            ;; If the first argument is not a URL, loop through all
-            ;; arguments and proceed accordingly.
-            (do ((arg (car args) (and (not (null? args))
-                                      (car args))))
-                ((or (null? arg) (not arg)))
-              (cond
-               ((or (string= arg "-v") (string= arg "--version"))
-                (display-version)
-                (exit 0))
-               ((or (string= arg "-h") (string= arg "--help"))
-                (display-help)
-                (exit 0))
-               (else
-                (format #t "Unrecognized option: ~a~%" (car args))))
-              (set! args (cdr args)))))
+    (cond
+     ((null? args)
+      (for-each-row print-row db "select * from bookmark"))
+     ((url-string? (car args))
+      (with-transaction
+       db (lambda ()
+            (add-bookmark
+             db (car args) (cadr args) (caddr args) (cdddr args)) #t)))
+     (else
+      (handle-regular-args args)))
     (finalize! db #t)))
 
 (main (command-line-arguments))