diff --git a/thinkpad/configuration.nix b/thinkpad/configuration.nix
index c901a96..88f193c 100644
--- a/thinkpad/configuration.nix
+++ b/thinkpad/configuration.nix
@@ -7,6 +7,9 @@
   ];
 
   nixpkgs.config.allowUnfree = true;
+  sound.enable = true;
+  time.timeZone = "Europe/Amsterdam";
+  virtualisation.libvirtd.enable = true;
 
   boot = {
     loader = {
@@ -48,15 +51,26 @@
   networking = {
     hostName = "sijmen-laptop";
     networkmanager.enable = true;
+    firewall = {
+      allowedTCPPorts = [
+        22      # ssh
+        22000   # syncthing sync
+        51414   # transmission
+        57621   # spotify connect
+      ];
+
+      allowedUDPPorts = [
+        21027   # syncthing discovery
+        22000   # syncthing sync
+      ];
+    };
   };
 
-  hardware.pulseaudio.enable = true;
-  hardware.bluetooth.enable = true;
-  sound.enable = true;
+  hardware = {
+    pulseaudio.enable = true;
+    bluetooth.enable = true;
+  };
 
-  time.timeZone = "Europe/Amsterdam";
-
-  # Select internationalisation properties.
   i18n = {
     defaultLocale = "en_US.UTF-8";
     supportedLocales = [
@@ -89,56 +103,43 @@
     systemPackages = with pkgs; [ gnome.adwaita-icon-theme ];
   };
 
-  services.pipewire.enable = true;
-  services.printing.enable = true;
+  services = {
+    pipewire.enable = true;
+    printing.enable = true;
+    throttled.enable = true;
 
-  services.xserver = {
-    enable = true;
-    displayManager.gdm.enable = true;
-    desktopManager.gnome.enable = true;
-  };
-
-  services.openssh = {
-    enable = true;
-    passwordAuthentication = false;
-  };
-
-  services.throttled.enable = true;
-
-  services.syncthing = {
-    enable = true;
-    user = "sijmen";
-    dataDir = config.users.users.sijmen.home;
-    overrideDevices = true;
-    overrideFolders = true;
-
-    devices = {
-      nas.id = "5XADATO-6ZKNZFK-YIX2TU3-RTUOAXR-OMWOAH6-OIUB7LE-TWM5B3C-W2I2FQU";
-      desktop-fedora.id = "RE3BCEP-2FVDNPA-C72KDCX-5NRTLD4-DEJZAIX-PJAMJAN-LJDFHOY-WOXNPQW";
+    xserver = {
+      enable = true;
+      displayManager.gdm.enable = true;
+      desktopManager.gnome.enable = true;
     };
 
-    folders = {
-      "vhuse-qjbcl" = {
-        path = "${config.users.users.sijmen.home}/Sync";
-        devices = [ "nas" "desktop-fedora" ];
+    openssh = {
+      enable = true;
+      passwordAuthentication = false;
+    };
+
+    syncthing = {
+      enable = true;
+      user = "sijmen";
+      dataDir = config.users.users.sijmen.home;
+      overrideDevices = true;
+      overrideFolders = true;
+
+      devices = {
+        nas.id = "5XADATO-6ZKNZFK-YIX2TU3-RTUOAXR-OMWOAH6-OIUB7LE-TWM5B3C-W2I2FQU";
+        desktop-fedora.id = "RE3BCEP-2FVDNPA-C72KDCX-5NRTLD4-DEJZAIX-PJAMJAN-LJDFHOY-WOXNPQW";
+      };
+
+      folders = {
+        "vhuse-qjbcl" = {
+          path = "${config.users.users.sijmen.home}/Sync";
+          devices = [ "nas" "desktop-fedora" ];
+        };
       };
     };
   };
 
-  networking.firewall = {
-    allowedTCPPorts = [
-      22      # ssh
-      22000   # syncthing sync
-      51414   # transmission
-      57621   # spotify connect
-    ];
-
-    allowedUDPPorts = [
-      21027   # syncthing discovery
-      22000   # syncthing sync
-    ];
-  };
-
   fonts.fonts = with pkgs; [
     noto-fonts
     noto-fonts-cjk
@@ -148,17 +149,9 @@
 
   programs.steam = {
     enable = true;
-    remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
-    dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
+    remotePlay.openFirewall = true;
+    dedicatedServer.openFirewall = true;
   };
 
-  virtualisation.libvirtd.enable = true;
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "22.05"; # Did you read the comment?
+  system.stateVersion = "22.05";
 }