refactored name.js

1 files changed, 20 insertions, 15 deletions

diff --git a/lib/name.js b/lib/name.js
index 7321064d..6544cec7 100644
--- a/lib/name.js
+++ b/lib/name.js
@@ -1,21 +1,26 @@
 var Helpers = require('./helpers');
 var definitions = require('./definitions');
 
-exports.firstName = function () {
-    return Helpers.randomize(definitions.first_name());
-};
+var _name = {
+    firstName: function () {
+        return Helpers.randomize(definitions.first_name());
+    },
 
-exports.lastName = function () {
-    return Helpers.randomize(definitions.last_name());
-};
-exports.findName = function () {
-    var r = Helpers.randomNumber(8);
-    switch (r) {
-    case 0:
-        return Helpers.randomize(definitions.name_prefix()) + " " + Helpers.randomize(definitions.first_name()) + " " +  Helpers.randomize(definitions.last_name());
-    case 1:
-        return Helpers.randomize(definitions.first_name()) + " " + Helpers.randomize(definitions.last_name()) + " " + Helpers.randomize(definitions.name_suffix);
-    }
+    lastName: function () {
+        return Helpers.randomize(definitions.last_name());
+    },
 
-    return Helpers.randomize(definitions.first_name()) + " " + Helpers.randomize(definitions.last_name());
+    findName: function () {
+        var r = Helpers.randomNumber(8);
+        switch (r) {
+        case 0:
+            return Helpers.randomize(definitions.name_prefix()) + " " + _name.firstName() + " " + _name.lastName();
+        case 1:
+            return _name.firstName() + " " + _name.lastName() + " " + Helpers.randomize(definitions.name_suffix);
+        }
+
+        return _name.firstName() + " " + _name.lastName();
+    }
 };
+
+module.exports = _name;