diff --git a/configuration.nix b/configuration.nix
index ca3e9f3..22912f3 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -52,11 +52,6 @@
        };
    };
 
-   services.flatpak.enable = true;
-
-   # Enable fwupd
-   services.fwupd.enable = true;
-
    # Define user accounts
    users.users.aaronh = {
            description = "Aaron Honeycutt";
@@ -77,9 +72,6 @@
    # Allow Unfree
    nixpkgs.config.allowUnfree = true;
 
-   # Enable 32 Bit libraries for applications like Steam
-   hardware.opengl.driSupport32Bit = true;
-
    # Install some packages
    environment.systemPackages = 
            with pkgs; 
@@ -91,13 +83,14 @@
                unzip
                wget
            ]; 
- 
-   # Enable the OpenSSH daemon
-   services.openssh.enable = true;
 
-   # Turn off PulseAudio
+   # Enable/Disable hardware
+   ## Turn off PulseAudio
    hardware.pulseaudio.enable = false;
 
+   ## Enable 32 Bit libraries for applications like Steam
+   hardware.opengl.driSupport32Bit = true;
+
    # Enable Pipewire
    security.rtkit.enable = true;
    services.pipewire = {
@@ -110,8 +103,11 @@
    # Enable Bluetooth
    hardware.bluetooth.enable = true;
 
-   # Enable CUPS
+   # Enable services
+   services.flatpak.enable = true;
+   services.fwupd.enable = true;
    services.printing.enable = true;
+   services.openssh.enable = true;
 
    # System 
    system.stateVersion = "22.11";