diff --git a/lib/code_update_utils.py b/lib/code_update_utils.py
index e8ee562..212dc3d 100644
--- a/lib/code_update_utils.py
+++ b/lib/code_update_utils.py
@@ -4,6 +4,8 @@
 This module provides utilities for code updates.
 """
 
+from robot.libraries.BuiltIn import BuiltIn
+
 import os
 import re
 import sys
@@ -16,11 +18,10 @@
 repo_data_path = re.sub('/lib', '/data', robot_pgm_dir_path)
 sys.path.append(repo_data_path)
 
-import bmc_ssh_utils as bsu
-import gen_robot_keyword as keyword
-import gen_print as gp
-import variables as var
-from robot.libraries.BuiltIn import BuiltIn
+import bmc_ssh_utils as bsu             # NOQA
+import gen_robot_keyword as keyword     # NOQA
+import gen_print as gp                  # NOQA
+import variables as var                 # NOQA
 
 
 def get_bmc_firmware(image_type, sw_dict):
diff --git a/lib/dump_utils.py b/lib/dump_utils.py
index d0b0108..f3691ed 100755
--- a/lib/dump_utils.py
+++ b/lib/dump_utils.py
@@ -4,20 +4,20 @@
 This file contains functions which are useful for processing BMC dumps.
 """
 
+from robot.libraries.BuiltIn import BuiltIn
 import gen_print as gp
 import gen_misc as gm
 import gen_robot_keyword as grk
 import bmc_ssh_utils as bsu
 import var_funcs as vf
 import os
-from robot.libraries.BuiltIn import BuiltIn
 import sys
 import os
 import imp
 base_path = os.path.dirname(os.path.dirname(
                             imp.find_module("gen_robot_print")[1])) + os.sep
 sys.path.append(base_path + "data/")
-import variables as var
+import variables as var     # NOQA
 
 
 def get_dump_dict(quiet=None):
diff --git a/lib/ffdc_cli_robot_script.py b/lib/ffdc_cli_robot_script.py
index 013e4ab..30fe428 100644
--- a/lib/ffdc_cli_robot_script.py
+++ b/lib/ffdc_cli_robot_script.py
@@ -4,12 +4,12 @@
 import sys
 
 
-sys.path.append(__file__.split(__file__.split("/")[-1])[0] + "../ffdc")
-from ffdc_collector import ffdc_collector
-from ssh_utility import SSHRemoteclient
-
 from robot.libraries.BuiltIn import BuiltIn as robotBuildIn
 
+sys.path.append(__file__.split(__file__.split("/")[-1])[0] + "../ffdc")
+from ffdc_collector import ffdc_collector  # NOQA
+from ssh_utility import SSHRemoteclient    # NOQA
+
 # (Sub) String constants used for input dictionary key search
 HOST = "HOST"
 USER = "USERNAME"
diff --git a/lib/gen_robot_ssh.py b/lib/gen_robot_ssh.py
index ab68415..b08d470 100755
--- a/lib/gen_robot_ssh.py
+++ b/lib/gen_robot_ssh.py
@@ -4,6 +4,9 @@
 This module provides many valuable ssh functions such as sprint_connection, execute_ssh_command, etc.
 """
 
+from robot.libraries.BuiltIn import BuiltIn
+from SSHLibrary import SSHLibrary
+
 import sys
 import traceback
 import re
@@ -18,8 +21,6 @@
 import func_timer as ft
 func_timer = ft.func_timer_class()
 
-from robot.libraries.BuiltIn import BuiltIn
-from SSHLibrary import SSHLibrary
 sshlib = SSHLibrary()
 
 
diff --git a/lib/ipmi_utils.py b/lib/ipmi_utils.py
index f8cc9be..38045f5 100644
--- a/lib/ipmi_utils.py
+++ b/lib/ipmi_utils.py
@@ -4,6 +4,7 @@
 Provide useful ipmi functions.
 """
 
+from robot.libraries.BuiltIn import BuiltIn
 import re
 import gen_print as gp
 import gen_misc as gm
@@ -14,9 +15,8 @@
 import var_funcs as vf
 import ipmi_client as ic
 import tempfile
-gru.my_import_resource("ipmi_client.robot")
-from robot.libraries.BuiltIn import BuiltIn
 import json
+gru.my_import_resource("ipmi_client.robot")
 
 
 def get_sol_info():
diff --git a/lib/logging_utils.py b/lib/logging_utils.py
index e621d5e..3e0d079 100644
--- a/lib/logging_utils.py
+++ b/lib/logging_utils.py
@@ -4,6 +4,8 @@
 Provide useful error log utility keywords.
 """
 
+from robot.libraries.BuiltIn import BuiltIn
+
 import gen_print as gp
 import sys
 import os
@@ -11,9 +13,8 @@
 base_path = os.path.dirname(os.path.dirname(
                             imp.find_module("gen_robot_print")[1])) + os.sep
 sys.path.append(base_path + "data/")
-import variables as var
-from robot.libraries.BuiltIn import BuiltIn
-import gen_robot_utils as gru
+import variables as var          # NOQA
+import gen_robot_utils as gru    # NOQA
 gru.my_import_resource("logging_utils.robot")
 
 
diff --git a/lib/obmc_boot_test.py b/lib/obmc_boot_test.py
index 0dc245d..452d607 100755
--- a/lib/obmc_boot_test.py
+++ b/lib/obmc_boot_test.py
@@ -38,7 +38,7 @@
                             imp.find_module("gen_robot_print")[1])) +\
     os.sep
 sys.path.append(base_path + "extended/")
-import run_keyword as rk
+import run_keyword as rk  # NOQA
 
 # Setting master_pid correctly influences the behavior of plug-ins like
 # DB_Logging
diff --git a/lib/pel_utils.py b/lib/pel_utils.py
index d361a4e..334f26d 100644
--- a/lib/pel_utils.py
+++ b/lib/pel_utils.py
@@ -14,7 +14,7 @@
 base_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 sys.path.append(base_path + "/data/")
 
-import pel_variables
+import pel_variables  # NOQA
 
 
 class peltool_exception(Exception):
diff --git a/lib/state_map.py b/lib/state_map.py
index 5d72b5a..abff002 100644
--- a/lib/state_map.py
+++ b/lib/state_map.py
@@ -16,8 +16,8 @@
 repo_data_dir_path = re.sub('/lib', '/data', robot_pgm_dir_path)
 sys.path.append(repo_data_dir_path)
 
-import gen_robot_keyword as keyword
-import variables as var
+import gen_robot_keyword as keyword  # NOQA
+import variables as var              # NOQA
 
 BuiltIn().import_resource("state_manager.robot")
 BuiltIn().import_resource("rest_client.robot")