diff --git a/macrostep.el b/macrostep.el
index 297d549..9214f70 100644
--- a/macrostep.el
+++ b/macrostep.el
@@ -289,7 +289,8 @@
 (make-variable-buffer-local 'macrostep-expansion-buffer)
 
 (defvar macrostep-outer-environment nil
-  "Outermost macro-expansion environment to use in a dedicated macro-expansion buffers.
+  "Outermost macro-expansion environment to use in a dedicated
+ macro-expansion buffers.
 
 This variable is used to save information about any enclosing
 `cl-macrolet' context when a macro form is expanded in a separate
@@ -361,7 +362,8 @@ buffer.")
   :type 'boolean)
 
 (defcustom macrostep-expand-compiler-macros t
-  "When non-nil, expand compiler macros as well as `defmacro' and `macrolet' macros."
+  "When non-nil, expand compiler macros as well as `defmacro' and
+`macrolet' macros."
   :group 'macrostep
   :type 'boolean)
 
@@ -497,7 +499,7 @@ Use \\[macrostep-collapse-all] or collapse all visible expansions to
 quit and return to normal editing.
 
 \\{macrostep-keymap}"
-  nil " Macro-Stepper"
+  :init-value nil :lighter " Macro-Stepper"
   :keymap macrostep-keymap
   :group macrostep
   (if macrostep-mode