diff --git a/InstallerResources/install.py b/InstallerResources/install.py
index a4fead5..5ce7c66 100644
--- a/InstallerResources/install.py
+++ b/InstallerResources/install.py
@@ -19,18 +19,18 @@
     raise Exception('Must install to Windows system')
 
   # Ensure environment variables are set
-  nacl_sdk_root = os.path.expandvars('%NACL_SDK_ROOT%', None)
-  chrome_path = os.path.expandvars('%CHROME_PATH%', None)
-  if nacl_sdk_root == None:
+  nacl_sdk_root = os.getenv('NACL_SDK_ROOT', None)
+  chrome_path = os.getenv('CHROME_PATH', None)
+  if nacl_sdk_root is None:
     raise Exception('Environment Variable NACL_SDK_ROOT is not set')
-  if chrome_path == None:
+  if chrome_path is None:
     raise Exception('Environment Variable CHROME_PATH is not set')
 
   # Copy the necessary files into place
-  addInDir = os.path.expandvars(
+  add_in_directory = os.path.expandvars(
     '%USERPROFILE%\My Documents\Visual Studio 2010\Addins')
-  shutil.copy('./NativeClientVSAddIn.AddIn', addInDir)
-  shutil.copy('./NativeClientVSAddIn.dll', addInDir)
+  shutil.copy('./NativeClientVSAddIn.AddIn', add_in_directory)
+  shutil.copy('./NativeClientVSAddIn.dll', add_in_directory)
 
 if __name__ == '__main__':
   main()
diff --git a/create_package.py b/create_package.py
index 1eab99d..e5bc0f8 100644
--- a/create_package.py
+++ b/create_package.py
@@ -10,9 +10,7 @@
 result in out/NativeClientVSAddin.zip
 """
 
-import glob
 import os
-import shutil
 import zipfile
 
 # Root output directory