   "Major mode for editing Buzz scripts."
   :group 'buzz
   :syntax-table buzz-syntax-table
-  ;; Set font lock
+  ;; Font lock
   (setq font-lock-defaults '((buzz-font-lock-list)))
-  ;; Modify the keymap
+  ;; Keymap
   (define-key buzz-mode-map [remap comment-dwim] 'buzz-comment-dwim)
-  ;;
+  ;; Indentation
   (setq indent-line-function 'buzz-indent-line) 
-  ;; Clear memory
+  ;; Clear useless variables to save memory
   (setq buzz-keywords-regexp nil)
+  (setq buzz-builtins-regexp nil)
   (setq buzz-functions-regexp nil)
-  )
+  (setq buzz-identifier-regexp nil))
 
 ;;
 ;; Associate Buzz mode with .bzz files
 ;;
 (add-to-list 'auto-mode-alist '("\\.bzz\\'" . buzz-mode))
 
+;;
+;; End with 'provide' statement
+;;
 (provide 'buzz-mode)

  (beginning-of-line)
  ;; Save current position
  (setq cur-point (point))
  ;; Setup a variables and execute stuff
  ;; cur-indent is the current line indentation
  (let ((cur-indent 0) (stop nil))
    ;; Save current point in buffer and execute commands
    (save-excursion

;;
;; Define token classes and regular expressions
;;
(setq buzz-identifier-regexp "[[:alnum:]_]+")
;; Keywords
(setq buzz-keywords '("var" "nil" "if" "else" "function" "return" "for" "while" "and" "or" "not"))
(setq buzz-keywords-regexp (regexp-opt buzz-keywords 'words))
