diff --git a/init.d/net/client.el b/init.d/net/client.el
index e7fb258..2aa8e0c 100644
--- a/init.d/net/client.el
+++ b/init.d/net/client.el
@@ -1,6 +1,6 @@
 ;;; client.el --- Network clients. -*- lexical-binding: t; -*-
 
-;; Time-stamp: <2020-05-26T06:13:03+0200>
+;; Time-stamp: <2020-05-27T04:11:23+0200>
 
 ;;; Commentary:
 
@@ -10,35 +10,25 @@
 
 ;; Explore and test HTTP REST webservices.
 (use-package restclient
-  :mode
-  ("\\.restclient$" . restclient-mode)
-  )
+  :mode ("\\.restclient$" . restclient-mode))
 
 ;; Company completion for restclient.
 (use-package company-restclient
   :after (restclient company)
-
-  :config
-  (add-to-list 'company-backends 'company-restclient)
-  )
+  :config (add-to-list 'company-backends 'company-restclient))
 
 (use-package webpaste
   :commands (webpaste-paste-region webpaste-paste-buffer)
-
-  :custom
-  (webpaste-provider-priority '("dpaste.org" "dpaste.com"))
-
-  :config
-  (add-to-list
-   'webpaste-providers-alist
-   '("dpaste.org"
-     :uri "https://dpaste.org/api/"
-     :post-data (("expires" . 86400))
-     :post-field "content"
-     :post-lang-field-name "lexer"
-     :lang-overrides ((emacs-lisp-mode . "clojure"))
-     :success-lambda webpaste--providers-success-returned-string))
-  )
+  :custom (webpaste-provider-priority '("dpaste.org" "dpaste.com"))
+  :config (add-to-list
+           'webpaste-providers-alist
+           '("dpaste.org"
+             :uri "https://dpaste.org/api/"
+             :post-data (("expires" . 86400))
+             :post-field "content"
+             :post-lang-field-name "lexer"
+             :lang-overrides ((emacs-lisp-mode . "clojure"))
+             :success-lambda webpaste--providers-success-returned-string)))
 
 ;; Gemini and Gopher client.
 (use-package elpher)
diff --git a/init.d/net/server.el b/init.d/net/server.el
index 9282c94..ec7e3c2 100644
--- a/init.d/net/server.el
+++ b/init.d/net/server.el
@@ -1,6 +1,6 @@
 ;;; server.el --- Set up network stuff.. -*- lexical-binding: t; -*-
 
-;; Time-stamp: <2020-05-09T17:51:29+0200>
+;; Time-stamp: <2020-05-27T04:21:10+0200>
 
 ;;; Commentary:
 
@@ -14,27 +14,23 @@
   (use-package tramp
     :straight nil                       ; Use built-in version.
     :defer 2
-
-    :custom
-    (tramp-use-ssh-controlmaster-options nil) ; Don't override SSH config.
-    (tramp-default-method "ssh")    ; ssh is faster than scp and supports ports.
-    (tramp-password-prompt-regexp   ; Add verification code support.
-     (concat
-      "^.*"
-      (regexp-opt
-       '("passphrase" "Passphrase"
-         "password" "Password"
-         "Verification code")
-       t)
-      ".*:\0? *"))
-    (tramp-connection-timeout 20)
-    ;; Auto-save locally.
-    (tramp-auto-save-directory (concat user-emacs-directory "backups/"))
-
-    :config
-    ;; Respect remote PATH.
-    (add-to-list 'tramp-remote-path 'tramp-own-remote-path)
-    )
+    :custom ((tramp-use-ssh-controlmaster-options nil
+                                                  "Don't override SSH config.")
+             (tramp-default-method "ssh" "Faster than scp and supports ports.")
+             (tramp-password-prompt-regexp
+              (concat
+               "^.*"
+               (regexp-opt
+                '("passphrase" "Passphrase"
+                  "password" "Password"
+                  "Verification code")
+                t)
+               ".*:\0? *") "Add verification code support.")
+             (tramp-connection-timeout 20)
+             (tramp-auto-save-directory
+              (concat user-emacs-directory "backups/") "Auto-save locally."))
+    :config (add-to-list
+             'tramp-remote-path 'tramp-own-remote-path)) ; Respect remote PATH.
   ) ; unless slow-computer.
 
 ;; Run server if:
@@ -46,42 +42,29 @@
     (use-package server
       :defer 2
       :functions (server-running-p)
-
-      :init
-      (setq server-use-tcp t
-            server-port 51313
-            server-auth-key ; 64 chars, saved in ~/.emacs.d/server/server.
-            "phahw2ohVoh0oopheish7IVie9desh8aequeenei3uo8wahShe%thuadaeNa4ieh")
-
-      :config
-      (unless (eq (server-running-p) t) ; Run server if not t.
-        (server-start))
-      )
+      :init (setq
+             server-use-tcp t
+             server-port 51313
+             server-auth-key ; 64 chars, saved in ~/.emacs.d/server/server.
+             "phahw2ohVoh0oopheish7IVie9desh8aequeenei3uo8wahShe%thuadaeNa4ieh")
+      :config (unless (eq (server-running-p) t)
+                (server-start)))
 
     ;; Server for Firefox-extension that allows to use Emacs to edit textareas.
     ;; https://addons.mozilla.org/en-US/firefox/addon/ghosttext/
     (use-package atomic-chrome
       :defer 2
-      :config
-      (atomic-chrome-start-server)
-
-      :custom
+      :config (atomic-chrome-start-server)
       ;; “url” is actually the hostname.
-      (atomic-chrome-url-major-mode-alist
-       '(
-         ("^likeable\\.space$" . markdown-mode)
-         ("^schlomp\\.space$" . gfm-mode)
-         ;; ("^wiki\\.gentoo\\.org$" . mediawiki-mode)
-         ("^github\\.com$" . gfm-mode)
-         ("^gitlab\\.com$" . gfm-mode)
-         ("^gitlab\\.gnome\\.org$" . gfm-mode)
-         ))
-      (atomic-chrome-buffer-open-style 'frame)
-
-      :hook
-      (atomic-chrome-edit-mode . (lambda () (setq-local fill-column 400)))
-      )
-    ))
+      :custom ((atomic-chrome-url-major-mode-alist
+                '(("^likeable\\.space$" . markdown-mode)
+                  ("^schlomp\\.space$" . gfm-mode)
+                  ;; ("^wiki\\.gentoo\\.org$" . mediawiki-mode)
+                  ("^github\\.com$" . gfm-mode)
+                  ("^gitlab\\.com$" . gfm-mode)
+                  ("^gitlab\\.gnome\\.org$" . gfm-mode)))
+               (atomic-chrome-buffer-open-style 'frame))
+      :hook (atomic-chrome-edit-mode . (lambda () (setq-fill-column 400))))))
 
 (provide 'net/server)
 ;;; server.el ends here