diff --git a/default.nix b/default.nix
index 6dca88241a5..9dd73430b66 100644
--- a/default.nix
+++ b/default.nix
@@ -3,8 +3,10 @@ let
   fromEnv = name: default:
     let env = builtins.getEnv name; in
     if env == "" then default else env;
+    
   configuration = import (fromEnv "NIXOS_CONFIG" /etc/nixos/configuration.nix);
-  nixpkgs   =         fromEnv "NIXPKGS"      /etc/nixos/nixpkgs;
+  
+  nixpkgs = fromEnv "NIXPKGS" /etc/nixos/nixpkgs;
 
   system = import system/system.nix { inherit configuration nixpkgs; };
 
diff --git a/upstart-jobs/sshd.nix b/upstart-jobs/sshd.nix
index d6c06b24f7e..38ccb2c19a1 100644
--- a/upstart-jobs/sshd.nix
+++ b/upstart-jobs/sshd.nix
@@ -87,6 +87,7 @@ let
 
   sshdUid = (import ../system/ids.nix).uids.sshd;
 
+  # !!! is this assertion evaluated anywhere???
   assertion = cfg.permitRootLogin == "yes" ||
        cfg.permitRootLogin == "without-password" ||
        cfg.permitRootLogin == "forced-commands-only" ||