diff --git a/.xinitrc b/.xinitrc
index 1b735a7..416bafc 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -15,6 +15,7 @@ sysmodmap=/etc/X11/xinit/.Xmodmap
 # start any default scripts
 if [ -d /etc/X11/xinit/xinitrc.d ] ; then
  for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
+  # shellcheck source=/dev/null
   [ -x "$f" ] && . "$f"
  done
  unset f
@@ -34,9 +35,11 @@ export TERMINAL=st
 screen_locker="xset dpms 0 0 10 dpms force off; i3lock --nofork -befc 000000; xset dpms 0 0 0"
 locktime=30 # Default screen lock timeout in minutes
 
-xset +dpms dpms 0 0 0 # Set DPMS features on, but disabled
+# Set DPMS features on, but disabled
+xset +dpms dpms 0 0 0
 
-eval $(ssh-agent) # Start ssh agent
+# Start ssh agent
+eval "$(ssh-agent)"
 
 # If srandrd is installed, start it up
 # ALL display/xrandr and touchscreen setup should be configured in ~/.config/srandrd.conf!
@@ -76,7 +79,7 @@ case $session in
 	fluxbox           ) exec startfluxbox;;
 	gnome             ) exec gnome-session;;
 	gnome-classic     ) exec gnome-session --session=gnome-classic;;
-	i3|i3wm           ) j4-make-config -a $(hostname).config archlinux # Create config
+	i3|i3wm           ) j4-make-config -a "$(hostname)".config archlinux # Create config
 			    exec i3;;
 	icewm             ) exec icewm-session;;
 	jwm               ) exec jwm;;
@@ -89,7 +92,7 @@ case $session in
 	xfce|xfce4        ) exec startxfce4;;
 	xmonad            ) exec xmonad;;
 	# No known session, try to run it as command
-	*) exec $1;;
+	*) exec "$1";;
 esac