diff --git a/smudge-controller.el b/smudge-controller.el
index 6af939f..1eb78b9 100644
--- a/smudge-controller.el
+++ b/smudge-controller.el
@@ -6,8 +6,9 @@
 
 ;;; Commentary:
 
-;; This library defines a set of commands for controlling an instance of a Spotify client.  The
-;; commands are sent via a multimethod-like dispatch to the chosen transport.
+;; This library defines a set of commands for controlling an instance of a
+;; Spotify client. The commands are sent via a multimethod-like dispatch to
+;; the chosen transport.
 
 ;;; Code:
 
@@ -33,8 +34,8 @@
   "How the commands should be sent to Spotify process.
 Defaults to 'connect, as it provides a consistent UX across all OSes."
   :type '(choice (symbol :tag "AppleScript" apple)
-                 (symbol :tag "D-Bus" dbus)
-                 (symbol :tag "Connect" connect))
+          (symbol :tag "D-Bus" dbus)
+          (symbol :tag "Connect" connect))
   :group 'smudge)
 
 (defcustom smudge-player-status-refresh-interval 5
diff --git a/smudge-dbus.el b/smudge-dbus.el
index ba1f668..774a1e7 100644
--- a/smudge-dbus.el
+++ b/smudge-dbus.el
@@ -6,12 +6,13 @@
 
 ;;; Commentary:
 
-;; This library handles controlling Spotify via the D-Bus interface.  It implements a set of
-;; multimethod-like functions that are dispatched in smudge-controller.el.
+;; This library handles controlling Spotify via the D-Bus interface.  It
+;; implements a set of multimethod-like functions that are dispatched in
+;; smudge-controller.el.
 
-;; Somehow shuffling, setting volume and loop status do not work as expected.  Querying the
-;; attribute does not return the expected value and setting it has no effect.  The dbus interface of
-;; Spotify seems to be broken.
+;; Somehow shuffling, setting volume and loop status do not work as expected.
+;; Querying the attribute does not return the expected value and setting it
+;; has no effect.  The dbus interface of Spotify seems to be broken.
 
 ;;; Code:
 
diff --git a/smudge-device-select.el b/smudge-device-select.el
index 257e5fc..ef8c906 100644
--- a/smudge-device-select.el
+++ b/smudge-device-select.el
@@ -6,8 +6,8 @@
 
 ;;; Commentary:
 
-;; This library implements methods, UI, and a minor mode to use the "connect" RESTful APIs to manage
-;; and query Spotify clients on the network.
+;; This library implements methods, UI, and a minor mode to use the "connect"
+;; RESTful APIs to manage and query Spotify clients on the network.
 
 ;;; Code:
 
diff --git a/smudge-playlist.el b/smudge-playlist.el
index 96aad8f..d64875f 100644
--- a/smudge-playlist.el
+++ b/smudge-playlist.el
@@ -6,7 +6,8 @@
 
 ;;; Commentary:
 
-;; This library implements UI and a major mode for searching and acting on Spotify playlists.
+;; This library implements UI and a major mode for searching and acting on
+;; Spotify playlists.
 
 ;;; Code:
 
diff --git a/smudge-remote.el b/smudge-remote.el
index 67aa5da..c0f09c9 100644
--- a/smudge-remote.el
+++ b/smudge-remote.el
@@ -6,8 +6,9 @@
 
 ;;; Commentary:
 
-;; This library implements a minor mode that allows for interacting with Spotify and displaying
-;; transport status.  This also includes a global minor mode definition.
+;; This library implements a minor mode that allows for interacting with
+;; Spotify and displaying transport status.  This also includes a global
+;; minor mode definition.
 
 ;;; Code:
 
@@ -22,8 +23,8 @@
 (defcustom smudge-status-location 'modeline
   "Specify where to show the player status: one of '(modeline title-bar nil)."
   :type '(choice (const :tag "Modeline" modeline)
-                 (const :tag "Title Bar" title-bar)
-                 (const :tag "Do not show" nil))
+          (const :tag "Title Bar" title-bar)
+          (const :tag "Do not show" nil))
   :group 'smudge)
 
 (defcustom smudge-title-bar-separator "    "
@@ -106,7 +107,7 @@ See commands \\[smudge-toggle-repeating] and
 (defvar smudge-remote-player-status-map
   (let ((map (make-sparse-keymap)))
     (define-key map (kbd "<mode-line> <mouse-1>")
-      'smudge-remote-popup-menu)
+                'smudge-remote-popup-menu)
     map)
   "Keymap for Smudge mode-line status.")
 
diff --git a/smudge-track.el b/smudge-track.el
index 2172559..4666a6f 100644
--- a/smudge-track.el
+++ b/smudge-track.el
@@ -6,7 +6,8 @@
 
 ;;; Commentary:
 
-;; This library implements UI and a major mode for searching and acting on Spotify playlists.
+;; This library implements UI and a major mode for searching and acting on
+;; Spotify playlists.
 
 ;;; Code:
 
diff --git a/smudge.el b/smudge.el
index 9ee24e8..3097180 100644
--- a/smudge.el
+++ b/smudge.el
@@ -15,12 +15,13 @@
 ;; This mode requires at least GNU Emacs 24.4
 
 ;; Before using this mode, first go the Spotify Web API console
-;; <https://developer.spotify.com/my-applications> and create a new application, adding
-;; <http://localhost:8080/smudge-callback> as the redirect URI (or whichever port you have
-;; specified via customize).
+;; <https://developer.spotify.com/my-applications> and create a new application,
+;; adding <http://localhost:8080/smudge-callback> as the redirect URI (or
+;; whichever port you have specified via customize).
 
-;; After requiring `smudge', make sure to define the client id and client secrets, along with some
-;; other important settings.  See README.md for the complete list of settings and usage information.
+;; After requiring `smudge', make sure to define the client id and client
+;; secrets, along with some other important settings.  See README.md for the
+;; complete list of settings and usage information.
 
 ;;; Code: