diff --git a/layers/+tools/chrome/funcs.el b/layers/+tools/chrome/funcs.el
new file mode 100644
index 000000000..8c5a08d82
--- /dev/null
+++ b/layers/+tools/chrome/funcs.el
@@ -0,0 +1,32 @@
+;;; funcs.el --- Chrome Layer functions File
+;;
+;; Copyright (c) 2012-2017 Sylvain Benner & Contributors
+;;
+;; Author: Sylvain Benner <sylvain.benner@gmail.com>
+;; URL: https://github.com/syl20bnr/spacemacs
+;;
+;; This file is not part of GNU Emacs.
+;;
+;;; License: GPLv3
+
+(defun spacemacs//flymd-start-browser (browser url)
+  (let ((process-environment (browse-url-process-environment)))
+    (apply 'start-process
+           "flymd" nil
+           browser
+           (list "--new-window" "--allow-file-access-from-files" url))))
+
+(defun spacemacs//flymd-browser-function (url)
+  (cond
+   (chrome-exec-path
+    (spacemacs//flymd-start-browser chrome-exec-path url))
+   ((executable-find "chromium")
+    (spacemacs//flymd-start-browser
+     (executable-find "chromium") url))
+   ((executable-find "google-chrome")
+    (spacemacs//flymd-start-browser
+     (executable-find "google-chrome") url))
+   ((executable-find "google-chrome-stable")
+    (spacemacs//flymd-start-browser
+     (executable-find "google-chrome-stable") url))
+   (t (message "no useful browser"))))
diff --git a/layers/+tools/chrome/packages.el b/layers/+tools/chrome/packages.el
index 58bffd19d..069efd486 100644
--- a/layers/+tools/chrome/packages.el
+++ b/layers/+tools/chrome/packages.el
@@ -17,13 +17,8 @@
 
 (defun chrome/init-edit-server ()
   (use-package edit-server
-    :init
-    (progn
-      (edit-server-start))
-    :config
-    (progn
-      (setq edit-server-default-major-mode 'markdown-mode))
-    ))
+    :init (edit-server-start)
+    :config (setq edit-server-default-major-mode 'markdown-mode)))
 
 (defun chrome/init-gmail-message-mode ()
   (use-package gmail-message-mode
@@ -32,21 +27,5 @@
 (defun chrome/init-flymd ()
   (use-package flymd
     :defer t
-    :init
-    (progn
-      (defun start-browser(browser url)
-        (let ((process-environment (browse-url-process-environment)))
-          (apply 'start-process
-                 "flymd" nil
-                 browser
-                 (list "--new-window" "--allow-file-access-from-files" url))))
-
-      (defun my-flymd-browser-function (url)
-               (cond
-                (chrome-exec-path (start-browser chrome-exec-path url))
-                ((executable-find "chromium") (start-browser (executable-find "chromium") url))
-                ((executable-find "google-chrome") (start-browser (executable-find "google-chrome") url))
-                ((executable-find "google-chrome-stable") (start-browser (executable-find "google-chrome-stable") url))
-                (t (message "no useful browser"))))
-
-      (setq flymd-browser-open-function 'my-flymd-browser-function))))
+    :init (setq flymd-browser-open-function
+                'spacemacs//flymd-browser-function)))