3 files changed, 15 insertions, 9 deletions
diff --git a/lib/helpers.js b/lib/helpers.js
index 6a86eb37..ccfaf561 100644
--- a/lib/helpers.js
+++ b/lib/helpers.js
@@ -34,10 +34,6 @@ exports.shuffle = function (o) {
     return o;
 };
 
-exports.generateDataSet = function (size) {
-    return undefined;
-};
-
 exports.createCard = function () {
     return {
         "name": Faker.Name.findName(),
diff --git a/lib/phone_number.js b/lib/phone_number.js
index 8f884419..71fc934c 100644
--- a/lib/phone_number.js
+++ b/lib/phone_number.js
@@ -1,10 +1,16 @@
+var Faker = require('../index');
 var Helpers = require('./helpers');
 var definitions = require('./definitions');
 
-exports.phoneNumber = function () {
-    return Helpers.replaceSymbolWithNumber(Helpers.randomize(definitions.phone_formats()));
-};
+var phone = {
+    phoneNumber: function () {
+        return Helpers.replaceSymbolWithNumber(Faker.random.phone_formats());
+    },
 
-exports.phoneNumberFormat = function (format) {
-    return Helpers.replaceSymbolWithNumber(definitions.phone_formats()[format]);
+    // FIXME: this is strange passing in an array index.
+    phoneNumberFormat: function (phoneFormatsArrayIndex) {
+        return Helpers.replaceSymbolWithNumber(definitions.phone_formats()[phoneFormatsArrayIndex]);
+    }
 };
+
+module.exports = phone;
diff --git a/lib/random.js b/lib/random.js
index 5717a20a..89dbd1fd 100644
--- a/lib/random.js
+++ b/lib/random.js
@@ -86,6 +86,10 @@ var random = {
 
     bs_noun: function () {
         return this.array_rand(definitions.bs_noun());
+    },
+
+    phone_formats: function () {
+        return this.array_rand(definitions.phone_formats());
     }
 };