diff --git a/package.json b/package.json
index 75bb217..1de7c76 100644
--- a/package.json
+++ b/package.json
@@ -7,13 +7,13 @@
       "email"     : "fyzlman@gmail.com",
       "url"       : "http://faisalman.com"
   },
-  "description" : "a simple user-agent string parser",
+  "description" : "Lightweight JavaScript-based user-agent parser",
   "keywords"    : [
     "user-agent",
     "parser",
     "browser"
   ],
-  "homepage"    : "https://faisalman.github.com/ua-parser-js",
+  "homepage"    : "http://faisalman.github.com/ua-parser-js",
   "contributors": [
     {
       "name"    : "Faisal Salman",
diff --git a/ua-parser.js b/ua-parser.js
index da88cf4..a05bd4c 100644
--- a/ua-parser.js
+++ b/ua-parser.js
@@ -1,5 +1,5 @@
 // UA-Parser.js v0.1.0
-// JavaScript-based user-agent parser
+// Lightweight JavaScript-based user-agent parser
 // https://github.com/faisalman/ua-parser-js
 //
 // Copyright © 2012 Faisalman
@@ -49,22 +49,24 @@ function uaparser(uastring){
         return i;
     };
 
-    var winMap  = function(){
-        switch(arguments[1].toLowerCase()){
-            case 'nt 5.0':
-                return '2000';
-            case 'nt 5.1':
-            case 'nt 5.2':
-                return 'XP';
-            case 'nt 6.0':
-                return 'Vista';
-            case 'nt 6.1':
-                return '7';
-            case 'nt 6.2':
-                return '8';
-            default:
-                return arguments[1];
-        };
+    var mapper  = {
+        win : function(){
+            switch(arguments[1].toLowerCase()){
+                case 'nt 5.0':
+                    return '2000';
+                case 'nt 5.1':
+                case 'nt 5.2':
+                    return 'XP';
+                case 'nt 6.0':
+                    return 'Vista';
+                case 'nt 6.1':
+                    return '7';
+                case 'nt 6.2':
+                    return '8';
+                default:
+                    return arguments[1];
+            };
+        }
     };
 
     this.ua = uastring || window.navigator.userAgent;
@@ -125,7 +127,7 @@ function uaparser(uastring){
 
             // Windows based
             /(windows\sphone\sos|windows)\s+([\w\.\s]+)*/i,                     // Windows
-            ], ['name', ['version', /(nt\s[\d\.]+)/gi, winMap]], [
+            ], ['name', ['version', /(nt\s[\d\.]+)/gi, mapper.win]], [
 
             // Mobile/Embedded OS
             /(blackberry).+version\/([\w\.]+)/i,                                // Blackberry