diff --git a/layers/+source-control/perforce/config.el b/layers/+source-control/perforce/config.el
deleted file mode 100644
index 6315b3434..000000000
--- a/layers/+source-control/perforce/config.el
+++ /dev/null
@@ -1,10 +0,0 @@
-;;; config.el --- Perforce Layer configuration File for Spacemacs
-;;
-;; Copyright (c) 2012-2016 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
diff --git a/layers/+source-control/perforce/packages.el b/layers/+source-control/perforce/packages.el
index 7afcd10f2..c2c1e206c 100644
--- a/layers/+source-control/perforce/packages.el
+++ b/layers/+source-control/perforce/packages.el
@@ -13,8 +13,6 @@
 
 (defun perforce/init-p4 ()
   (use-package p4
-    :init
-    (spacemacs/declare-prefix "p4" "perforce")
     :commands (p4-add
                p4-branch
                p4-branches
@@ -61,49 +59,51 @@
                p4-diff-all-opened
                p4-ediff)
     :init
-    (spacemacs/set-leader-keys
-      "p4a" 'p4-add
-      "p4b" 'p4-branch
-      "p4B" 'p4-branches
-      "p4c" 'p4-client
-      "p4C" 'p4-changes
-      "p4d" 'p4-diff2
-      "p4D" 'p4-describe
-      "p4e" 'p4-edit
-      "p4E" 'p4-reopen
-      "p4@" 'p4-depot-find-file
-      "p4f" 'p4-filelog
-      "p4F" 'p4-files
-      "p4G" 'p4-get-client-name
-      "p4g" 'p4-update
-      "p4h" 'p4-help
-      "p4H" 'p4-have
-      "p4i" 'p4-info
-      "p4I" 'p4-integ
-      "p4j" 'p4-job
-      "p4J" 'p4-jobs
-      "p4l" 'p4-label
-      "p4L" 'p4-labels
-      "p4:" 'p4-labelsync
-      "p4m" 'p4-move
-      "p4o" 'p4-opened
-      "p4p" 'p4-print
-      "p4P" 'p4-set-p4-port
-      "p4q" 'quit-window
-      "p4r" 'p4-revert
-      "p4R" 'p4-refresh
-      "p4y" 'p4-resolve
-      "p4s" 'p4-status
-      "p4S" 'p4-submit
-      "p4t" 'p4-toggle-vc-mode
-      "p4u" 'p4-user
-      "p4U" 'p4-users
-      "p4v" 'p4-version
-      "p4V" 'p4-annotate
-      "p4w" 'p4-where
-      "p4x" 'p4-delete
-      "p4X" 'p4-fix
-      "p4z" 'p4-reconcile
-      "p4=" 'p4-diff
-      "p4+" 'p4-diff-all-opened
-      "p4-" 'p4-ediff)))
+    (progn
+      (spacemacs/declare-prefix "p4" "perforce")
+      (spacemacs/set-leader-keys
+        "p4a" 'p4-add
+        "p4b" 'p4-branch
+        "p4B" 'p4-branches
+        "p4c" 'p4-client
+        "p4C" 'p4-changes
+        "p4d" 'p4-diff2
+        "p4D" 'p4-describe
+        "p4e" 'p4-edit
+        "p4E" 'p4-reopen
+        "p4@" 'p4-depot-find-file
+        "p4f" 'p4-filelog
+        "p4F" 'p4-files
+        "p4G" 'p4-get-client-name
+        "p4g" 'p4-update
+        "p4h" 'p4-help
+        "p4H" 'p4-have
+        "p4i" 'p4-info
+        "p4I" 'p4-integ
+        "p4j" 'p4-job
+        "p4J" 'p4-jobs
+        "p4l" 'p4-label
+        "p4L" 'p4-labels
+        "p4:" 'p4-labelsync
+        "p4m" 'p4-move
+        "p4o" 'p4-opened
+        "p4p" 'p4-print
+        "p4P" 'p4-set-p4-port
+        "p4q" 'quit-window
+        "p4r" 'p4-revert
+        "p4R" 'p4-refresh
+        "p4y" 'p4-resolve
+        "p4s" 'p4-status
+        "p4S" 'p4-submit
+        "p4t" 'p4-toggle-vc-mode
+        "p4u" 'p4-user
+        "p4U" 'p4-users
+        "p4v" 'p4-version
+        "p4V" 'p4-annotate
+        "p4w" 'p4-where
+        "p4x" 'p4-delete
+        "p4X" 'p4-fix
+        "p4z" 'p4-reconcile
+        "p4=" 'p4-diff
+        "p4+" 'p4-diff-all-opened
+        "p4-" 'p4-ediff))))