diff --git a/mpd.asd b/mpd.asd
index 28046c0..f436eb4 100644
--- a/mpd.asd
+++ b/mpd.asd
@@ -1,4 +1,4 @@
-;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 
 (defpackage #:mpd-asd
   (:use :cl :asdf))
@@ -6,9 +6,9 @@
 (in-package :mpd-asd)
 
 (defsystem mpd
-    :name "mpd"
-    :description "MPD client"
-    :serial t
-    :depends-on (:usocket :cl-ppcre)
-    :components ((:file "package")
-		 (:file "mpd")))
+  :name "mpd"
+  :description "MPD client"
+  :serial t
+  :depends-on (:usocket :cl-ppcre)
+  :components ((:file "package")
+	       (:file "mpd")))
diff --git a/mpd.lisp b/mpd.lisp
index 5eec215..8d90269 100644
--- a/mpd.lisp
+++ b/mpd.lisp
@@ -1,15 +1,16 @@
-;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 
-;;; This software is in the public domain and is
-;;; provided with absolutely no warranty.
+;; This software is in the public domain and is
+;; provided with absolutely no warranty.
 
 (in-package :mpd)
 
 (defparameter *defualt-host* "localhost")
 (defparameter *default-port* 6600)
 
-(defun to-keyword (symbol)
-  (intern (string-upcase (string symbol)) :keyword))
+(eval-when (:compile-toplevel)
+  (defun to-keyword (symbol)
+    (intern (string-upcase (string symbol)) :keyword)))
 
 (defmacro make-class (name slots)
   `(defclass ,name ()
diff --git a/package.lisp b/package.lisp
index dc8394c..3d03417 100644
--- a/package.lisp
+++ b/package.lisp
@@ -1,4 +1,4 @@
-;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
 
 (in-package :cl-user)