@@ -142,7 +142,7 @@ def main(params=None):
         print(general.title(banner.text))
 
         saying_hello = """
-     Checkfy | Copyright (C) Yaiza Rubio & Félix Brezo (i3visio) 2014-2018
+     Checkfy | Copyright (C) Yaiza Rubio & Félix Brezo (i3visio) 2014-2020
 
 This program comes with ABSOLUTELY NO WARRANTY. This is free software, and you
 are welcome to redistribute it under certain conditions. For additional info,
 
@@ -491,7 +491,7 @@ def main(params=None):
         print(general.title(banner.text))
 
     saying_hello = f"""
-    Domainfy | Copyright (C) Yaiza Rubio & Félix Brezo (i3visio) 2014-2019
+    Domainfy | Copyright (C) Yaiza Rubio & Félix Brezo (i3visio) 2014-2020
 
 This program comes with ABSOLUTELY NO WARRANTY. This is free software, and you
 are welcome to redistribute it under certain conditions. For additional info,
 
@@ -1,9 +1,6 @@
-#!/usr/bin/python2
-# -*- coding: utf-8 -*-
-#
 ################################################################################
 #
-#    Copyright 2015-2018 Félix Brezo and Yaiza Rubio
+#    Copyright 2015-2020 Félix Brezo and Yaiza Rubio
 #
 #    This program is part of OSRFramework. You can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as published by
@@ -20,7 +17,6 @@
 #
 ################################################################################
 
-
 import argparse
 import datetime as dt
 import json
@@ -34,93 +30,85 @@
 import osrframework.utils.general as general
 
 
-def processPhoneList(platformNames=[], numbers=[], excludePlatformNames=[]):
-    """
-    Method to perform searchs on a series of numbers.
+def process_phone_list(platformNames=[], numbers=[], exclude_platform_names=[]):
+    """Method to perform searchs on a series of numbers
 
     Args:
-    -----
         platformNames: List of names of the platforms.
         numbers: List of numbers to be queried.
-        excludePlatformNames: A list of platforms not to be searched.
+        exclude_platform_names: A list of platforms not to be searched.
 
     Return:
-    -------
         A list of verified emails.
     """
     # Grabbing the <Platform> objects
-    platforms = platform_selection.getPlatformsByName(platformNames, mode="phonefy", excludePlatformNames=excludePlatformNames)
+    platforms = platform_selection.get_platforms_by_name(platformNames, mode="phonefy", exclude_platform_names=exclude_platform_names)
 
     results = []
     for num in numbers:
         for pla in platforms:
             # This returns a json.txt!
-            entities = pla.getInfo(query=num, process=True, mode="phonefy")
+            entities = pla.get_info(query=num, mode="phonefy")
             if entities != {}:
-                results+=json.loads(entities)
+                results += json.loads(entities)
     return results
 
 
-def getParser():
-    DEFAULT_VALUES = configuration.returnListOfConfigurationValues("phonefy")
+def get_parser():
+    DEFAULT_VALUES = configuration.get_configuration_values_for("phonefy")
     # Capturing errors just in case the option is not found in the configuration
     try:
-        excludeList = [DEFAULT_VALUES["exclude_platforms"]]
+        exclude_list = [DEFAULT_VALUES["exclude_platforms"]]
     except:
-        excludeList = []
+        exclude_list = []
 
     parser = argparse.ArgumentParser(description='phonefy - Piece of software that checks the existence of a given series of phones in a bunch of phone number lists associated to malicious activities.', prog='phonefy', epilog='Check the README.md file for further details on the usage of this program or follow us on Twitter in <http://twitter.com/i3visio>.', add_help=False, conflict_handler='resolve')
     parser._optionals.title = "Input options (one required)"
 
     # Defining the mutually exclusive group for the main options
-    groupMainOptions = parser.add_mutually_exclusive_group(required=True)
+    group_main_options = parser.add_mutually_exclusive_group(required=True)
     # Adding the main options
-    groupMainOptions.add_argument('--license', required=False, action='store_true', default=False, help='shows the GPLv3+ license and exists.')
-    groupMainOptions.add_argument('-n', '--numbers', metavar='<phones>', nargs='+', action='store', help='the list of phones to process (at least one is required).')
+    group_main_options.add_argument('--license', required=False, action='store_true', default=False, help='shows the GPLv3+ license and exists.')
+    group_main_options.add_argument('-n', '--numbers', metavar='<phones>', nargs='+', action='store', help='the list of phones to process (at least one is required).')
 
-    listAll = platform_selection.getAllPlatformNames("phonefy")
+    list_all = platform_selection.get_all_platform_names("phonefy")
 
     # Configuring the processing options
-    groupProcessing = parser.add_argument_group('Processing arguments', 'Configuring the way in which usufy will process the identified profiles.')
-    #groupProcessing.add_argument('-L', '--logfolder', metavar='<path_to_log_folder', required=False, default = './logs', action='store', help='path to the log folder. If none was provided, ./logs is assumed.')
-    groupProcessing.add_argument('-e', '--extension', metavar='<sum_ext>', nargs='+', choices=['csv', 'gml', 'json', 'ods', 'png', 'txt', 'xls', 'xlsx' ], required=False, default=DEFAULT_VALUES["extension"], action='store', help='output extension for the summary files. Default: xls.')
-    groupProcessing.add_argument('-o', '--output_folder', metavar='<path_to_output_folder>', required=False, default=DEFAULT_VALUES["output_folder"], action='store', help='output folder for the generated documents. While if the paths does not exist, usufy.py will try to create; if this argument is not provided, usufy will NOT write any down any data. Check permissions if something goes wrong.')
-    groupProcessing.add_argument('-p', '--platforms', metavar='<platform>', choices=listAll, nargs='+', required=False, default=DEFAULT_VALUES["platforms"] ,action='store', help='select the platforms where you want to perform the search amongst the following: ' + str(listAll) + '. More than one option can be selected.')
-    # Getting a sample header for the output files
-    groupProcessing.add_argument('-F', '--file_header', metavar='<alternative_header_file>', required=False, default=DEFAULT_VALUES["file_header"], action='store', help='Header for the output filenames to be generated. If None was provided the following will be used: profiles.<extension>.' )
-    groupProcessing.add_argument('--quiet', required=False, action='store_true', default=False, help='tells the program not to show anything.')
-    groupProcessing.add_argument('-w', '--web_browser', required=False, action='store_true', help='opening the URIs returned in the default web browser.')
-    groupProcessing.add_argument('-x', '--exclude', metavar='<platform>', choices=listAll, nargs='+', required=False, default=excludeList, action='store', help='select the platforms that you want to exclude from the processing.')
+    group_processing = parser.add_argument_group('Processing arguments', 'Configuring the way in which usufy will process the identified profiles.')
+    group_processing.add_argument('-e', '--extension', metavar='<sum_ext>', nargs='+', choices=['csv', 'gml', 'json', 'ods', 'png', 'txt', 'xls', 'xlsx' ], required=False, default=DEFAULT_VALUES["extension"], action='store', help='output extension for the summary files. Default: xls.')
+    group_processing.add_argument('-o', '--output_folder', metavar='<path_to_output_folder>', required=False, default=DEFAULT_VALUES["output_folder"], action='store', help='output folder for the generated documents. While if the paths does not exist, usufy.py will try to create; if this argument is not provided, usufy will NOT write any down any data. Check permissions if something goes wrong.')
+    group_processing.add_argument('-p', '--platforms', metavar='<platform>', choices=list_all, nargs='+', required=False, default=DEFAULT_VALUES["platforms"] ,action='store', help='select the platforms where you want to perform the search amongst the following: ' + str(list_all) + '. More than one option can be selected.')
+    group_processing.add_argument('-F', '--file_header', metavar='<alternative_header_file>', required=False, default=DEFAULT_VALUES["file_header"], action='store', help='Header for the output filenames to be generated. If None was provided the following will be used: profiles.<extension>.' )
+    group_processing.add_argument('--quiet', required=False, action='store_true', default=False, help='tells the program not to show anything.')
+    group_processing.add_argument('-w', '--web_browser', required=False, action='store_true', help='opening the URIs returned in the default web browser.')
+    group_processing.add_argument('-x', '--exclude', metavar='<platform>', choices=list_all, nargs='+', required=False, default=exclude_list, action='store', help='select the platforms that you want to exclude from the processing.')
 
 
     # About options
-    groupAbout = parser.add_argument_group('About arguments', 'Showing additional information about this program.')
-    groupAbout.add_argument('-h', '--help', action='help', help='shows this help and exists.')
-    groupAbout.add_argument('--version', action='version', version='[%(prog)s] OSRFramework ' + osrframework.__version__, help='shows the version of the program and exists.')
+    group_about = parser.add_argument_group('About arguments', 'Showing additional information about this program.')
+    group_about.add_argument('-h', '--help', action='help', help='shows this help and exists.')
+    group_about.add_argument('--version', action='version', version='[%(prog)s] OSRFramework ' + osrframework.__version__, help='shows the version of the program and exists.')
 
     return parser
 
 
 def main(params=None):
-    """
-    Main function to launch phonefy.
+    """Main function to launch phonefy
 
     The function is created in this way so as to let other applications make
     use of the full configuration capabilities of the application. The
-    parameters received are used as parsed by this modules `getParser()`.
+    parameters received are used as parsed by this modules `get_parser()`.
 
     Args:
-    -----
         params: A list with the parameters as grabbed by the terminal. It is
             None when this is called by an entry_point. If it is called by osrf
             the data is already parsed.
 
     Returns:
-    --------
         A list of i3visio entities.
     """
     if params == None:
-        parser = getParser()
+        parser = get_parser()
         args = parser.parse_args(params)
     else:
         args = params
@@ -130,25 +118,25 @@ def main(params=None):
     if not args.quiet:
         print(general.title(banner.text))
 
-    sayingHello = """
-     Phonefy | Copyright (C) Yaiza Rubio & Félix Brezo (i3visio) 2014-2018
+    saying_hello = f"""
+     Phonefy | Copyright (C) Yaiza Rubio & Félix Brezo (i3visio) 2014-2020
 
 This program comes with ABSOLUTELY NO WARRANTY. This is free software, and you
 are welcome to redistribute it under certain conditions. For additional info,
-visit <{}>.
-""".format(general.LICENSE_URL)
-    print(general.info(sayingHello))
+visit <{general.LICENSE_URL}>.
+"""
+    print(general.info(saying_hello))
 
     if args.license:
         general.showLicense()
     else:
         # Showing the execution time...
-        startTime= dt.datetime.now()
-        #TODO: Get the number searchable platforms in this context
-        print(str(startTime) + "\tStarting search in different platform(s)... Relax!\n")
+        start_time = dt.datetime.now()
+
+        print(f"\n{start_time}\tStarting search in different platform(s)... Relax!\n")
         print(general.emphasis("\tPress <Ctrl + C> to stop...\n"))
         try:
-            results = processPhoneList(platformNames=args.platforms, numbers=args.numbers, excludePlatformNames=args.exclude)
+            results = process_phone_list(platformNames=args.platforms, numbers=args.numbers, exclude_platform_names=args.exclude)
         except KeyboardInterrupt:
             print(general.error("\n[!] Process manually stopped by the user. Workers terminated without providing any result.\n"))
 
@@ -158,32 +146,30 @@ def main(params=None):
             if not os.path.exists(args.output_folder):
                 os.makedirs(args.output_folder)
             # Grabbing the results
-            fileHeader = os.path.join(args.output_folder, args.file_header)
+            file_header = os.path.join(args.output_folder, args.file_header)
             for ext in args.extension:
                 # Generating output files
-                general.exportUsufy(results, ext, fileHeader)
+                general.export_usufy(results, ext, file_header)
 
         # Showing the information gathered if requested
         if not args.quiet:
             now = dt.datetime.now()
-            print("\n{}\tResults obtained:\n".format(str(now)))
-            print(general.success(general.usufyToTextExport(results)))
+            print(f"\n{now}\tResults obtained:\n")
+            print(general.success(general.osrf_to_text_export(results)))
 
             if args.web_browser:
-                general.openResultsInBrowser(results)
+                general.open_results_in_browser(results)
 
             now = dt.datetime.now()
-            print("\n" + str(now) + "\tYou can find all the information collected in the following files:")
+            print(f"\n{now}\tYou can find all the information collected in the following files:")
             for ext in args.extension:
                 # Showing the output files
-                print("\t" + general.emphasis(fileHeader + "." + ext))
+                print("\t" + general.emphasis(file_header + "." + ext))
 
             # Showing the execution time...
-            endTime= dt.datetime.now()
-            print("\n" + str(endTime) +"\tFinishing execution...\n")
-            print("Total time consumed:\t" + general.emphasis(str(endTime-startTime)) + "\n")
-            #TODO: Get the number searchable platforms in this context
-            #print("Average seconds/query:\t" + general.emphasis(str((endTime-startTime).total_seconds()/len(listPlatforms))) +" seconds\n")
+            end_time = dt.datetime.now()
+            print(f"\n{end_time}\tFinishing execution...\n")
+            print("Total time consumed:\t" + general.emphasis(str(end_time-start_time)) + "\n")
 
             # Urging users to place an issue on Github...
             print(banner.footer)
 
@@ -25,7 +25,7 @@
 import osrframework.utils.errors as errors
 
 
-def changePermissionsRecursively(path, uid, gid):
+def change_permissions_recursively(path, uid, gid):
     """Function to recursively change the user id and group id
 
     It sets 700 permissions in the different files.
@@ -54,7 +54,7 @@ def changePermissionsRecursively(path, uid, gid):
             # Setting permissions
             os.chmod(itempath, 6600)
             # Recursive function to iterate the files
-            changePermissionsRecursively(itempath, uid, gid)
+            change_permissions_recursively(itempath, uid, gid)
 
 
 def get_config_path(config_file_name=None):
 
@@ -48,19 +48,19 @@ def export_usufy(data, ext, fileH):
     if ext == "csv":
         osrf_to_csv_export(data, fileH+"."+ext)
     elif ext == "gml":
-        usufyToGmlExport(data, fileH+"."+ext)
+        osrf_to_gml_export(data, fileH+"."+ext)
     elif ext == "json":
         osrf_to_json_export(data, fileH+"."+ext)
     elif ext == "ods":
         osrf_to_ods_export(data, fileH+"."+ext)
     elif ext == "png":
-        usufyToPngExport(data, fileH+"."+ext)
+        osrf_to_png_export(data, fileH+"."+ext)
     elif ext == "txt":
         osrf_to_text_export(data, fileH+"."+ext)
     elif ext == "xls":
-        usufy_to_xls_export(data, fileH+"."+ext)
+        osrf_to_xls_export(data, fileH+"."+ext)
     elif ext == "xlsx":
-        usufy_to_xlsx_export(data, fileH+"."+ext)
+        osrf_to_xlsx_export(data, fileH+"."+ext)
 
 
 def _generate_tabular_data(res, oldtabular_data={}, is_terminal=False):
@@ -70,8 +70,8 @@ def _generate_tabular_data(res, oldtabular_data={}, is_terminal=False):
     This method is used by:
         - osrf_to_csv_export
         - osrf_to_ods_export
-        - usufy_to_xls_export
-        - usufy_to_xlsx_export
+        - osrf_to_xls_export
+        - osrf_to_xlsx_export
 
     Args:
         res: New data to export.
@@ -363,7 +363,7 @@ def osrf_to_ods_export(data, file_path):
     save_data(file_path, tabular_data)
 
 
-def usufy_to_xls_export(data, file_path):
+def osrf_to_xls_export(data, file_path):
     """
     Workaround to export to a .xls file.
 
@@ -387,7 +387,7 @@ def usufy_to_xls_export(data, file_path):
     save_data(file_path, tabular_data)
 
 
-def usufy_to_xlsx_export(data, file_path):
+def osrf_to_xlsx_export(data, file_path):
     """
     Workaround to export to a .xlsx file.
 
@@ -555,7 +555,7 @@ def _processAttributes(elems, g):
     return graphData
 
 
-def usufyToGmlExport(d, file_path):
+def osrf_to_gml_export(d, file_path):
     """Workaround to export data to a .gml file.
 
     Args:
@@ -584,7 +584,7 @@ def usufyToGmlExport(d, file_path):
     nx.write_gml(newGraph,file_path)
 
 
-def usufyToPngExport(d, file_path):
+def osrf_to_png_export(d, file_path):
     """Workaround to export to a png file.
 
     Args:
@@ -688,7 +688,7 @@ def urisToBrowser(uris=[], autoraise=True):
         os.dup2(savout2, 2)
 
 
-def openResultsInBrowser(res):
+def open_results_in_browser(res):
     """Method that collects the URI from a list of entities and opens them
 
     Args: