diff --git a/other/password_generator.py b/other/password_generator.py
index 8916079fc..fd0701041 100644
--- a/other/password_generator.py
+++ b/other/password_generator.py
@@ -1,35 +1,53 @@
+"""Password generator allows you to generate a random password of length N."""
 from __future__ import print_function
-import string
-import random
-
-letters = [letter for letter in string.ascii_letters]
-digits = [digit for digit in string.digits]
-symbols = [symbol for symbol in string.punctuation]
-chars = letters + digits + symbols
-random.shuffle(chars)
-
-min_length = 8
-max_length = 16
-password = ''.join(random.choice(chars) for x in range(random.randint(min_length, max_length)))
-print('Password: ' + password)
-print('[ If you are thinking of using this passsword, You better save it. ]')
+from random import choice
+from string import ascii_letters, digits, punctuation
 
 
-# ALTERNATIVE METHODS  
+def password_generator(length=8):
+    """
+    >>> len(password_generator())
+    8
+    >>> len(password_generator(length=16))
+    16
+    >>> len(password_generator(257))
+    257
+    >>> len(password_generator(length=0))
+    0
+    >>> len(password_generator(-1))
+    0
+    """
+    chars = tuple(ascii_letters) + tuple(digits) + tuple(punctuation)
+    return ''.join(choice(chars) for x in range(length))
+
+
+# ALTERNATIVE METHODS
 # ctbi= characters that must be in password
-# i= how many letters or characters the password length will be 
-def password_generator(ctbi, i):
-  # Password generator = full boot with random_number, random_letters, and random_character FUNCTIONS
-  pass  # Put your code here...
+# i= how many letters or characters the password length will be
+def alternative_password_generator(ctbi, i):
+    # Password generator = full boot with random_number, random_letters, and
+    # random_character FUNCTIONS
+    pass  # Put your code here...
 
 
 def random_number(ctbi, i):
-  pass  # Put your code here...
+    pass  # Put your code here...
 
 
 def random_letters(ctbi, i):
-  pass  # Put your code here...
+    pass  # Put your code here...
 
 
 def random_characters(ctbi, i):
-  pass  # Put your code here...
+    pass  # Put your code here...
+
+
+def main():
+    length = int(
+        input('Please indicate the max length of your password: ').strip())
+    print('Password generated:', password_generator(length))
+    print('[If you are thinking of using this passsword, You better save it.]')
+
+
+if __name__ == '__main__':
+    main()