diff --git a/TODO b/TODO
index 045d6fb..8974d11 100644
--- a/TODO
+++ b/TODO
@@ -34,9 +34,6 @@
   CLOSED: [2011-08-24 Wed 18:21]
   Need more flexibility and need to be able to play with the current buffer even in background
 
-* TODO clean the code
-  Need to decide if every function can access the global variable
-
 * TODO Create a proper playlist-mode
   - Use format-like string to let the user change the format of a song appearing
     in the playlist. (see [[file:~/.myconfigs/.emacs.d/el-get/nognus/lisp/gnus-spec.el::(defun%20gnus-parse-simple-format%20(format%20spec-alist%20&optional%20insert)][gnus-parse-simple-format]] and [[file:~/.myconfigs/.emacs.d/el-get/nognus/lisp/gnus-sum.el::(defvar%20gnus-summary-line-format-alist][gnus-summary-line-format-alist]])
diff --git a/empc.el b/empc.el
index f6cc78f..f9c9736 100644
--- a/empc.el
+++ b/empc.el
@@ -130,7 +130,7 @@ If there is no command left to send, put the client in idle state."
 (defun empc-song (object pos) (gethash (elt (empc-playlist object) pos) (empc-playlist-songs object)))
 (defun empc-current-song (object) (gethash (empc-status-get object :songid) (empc-playlist-songs object)))
 
-(defun empc-create (name buffer host port)
+(defun empc-create (name buffer host service)
   "Create and return a new object for empc. The parameters are as follows:
 
 NAME is the name for the process.  It is modified if necessary to
@@ -142,7 +142,7 @@ HOST is the name or IP address of the host to connect to.
 SERVICE is the name of the service desired, or an integer specifying
  a port number to connect to."
 
-  (let* ((process (open-network-stream name buffer host port))
+  (let* ((process (open-network-stream name buffer host service))
 	 (object `((nil ,process) nil nil))) ;; this weird form represents an empty object as described in empc-object
     (empc-queue-push object nil nil `(lambda (proc string)
 				      (message "Connection to %s established" ',host)))
@@ -196,11 +196,6 @@ SERVICE is the name of the service desired, or an integer specifying
 	   (when empc-verbose
 	     (message "empc: connection closed"))))))
 
-(defun empc-enqueue (object command closure fn)
-  "Add COMMAND to the end of the queue before sending it to the server."
-  (empc-queue-push object command closure fn)
-  (process-send-string (empc-process object) command))
-
 (defun empc-process-filter (object string)
   "Append STRING to the process buffer then process the data."
   (let ((debug-on-error t)