diff --git a/foqus_lib/framework/graph/nodeVars.py b/foqus_lib/framework/graph/nodeVars.py
index d43312349..d9ec39af6 100644
--- a/foqus_lib/framework/graph/nodeVars.py
+++ b/foqus_lib/framework/graph/nodeVars.py
@@ -26,7 +26,7 @@
 from collections import OrderedDict
 
 
-from foqus_lib.framework.foqusException.foqusException import *
+from foqus_lib.framework.foqusException.foqusException import foqusException
 from foqus_lib.framework.uq.Distribution import Distribution
 
 ivarScales = [  # list of scaling options for input variables
diff --git a/foqus_lib/framework/sim/turbineConfiguration.py b/foqus_lib/framework/sim/turbineConfiguration.py
index dd197d1db..c6c931548 100644
--- a/foqus_lib/framework/sim/turbineConfiguration.py
+++ b/foqus_lib/framework/sim/turbineConfiguration.py
@@ -53,7 +53,7 @@
 
 from foqus_lib import core
 import foqus_lib.framework.sim.process_management as _pm
-from foqus_lib.framework.foqusException.foqusException import *
+from foqus_lib.framework.foqusException.foqusException import foqusException
 
 _log = logging.getLogger("foqus." + __name__)
 
diff --git a/foqus_lib/framework/uq/Model.py b/foqus_lib/framework/uq/Model.py
index c1991cf69..a3d79aa70 100644
--- a/foqus_lib/framework/uq/Model.py
+++ b/foqus_lib/framework/uq/Model.py
@@ -108,7 +108,7 @@
 
 import numpy
 
-from .Distribution import *
+from .Distribution import Distribution
 
 
 class Model:
diff --git a/foqus_lib/gui/flowsheet/dataBrowserDialog.py b/foqus_lib/gui/flowsheet/dataBrowserDialog.py
index 2e172c9ff..f44629fa3 100644
--- a/foqus_lib/gui/flowsheet/dataBrowserDialog.py
+++ b/foqus_lib/gui/flowsheet/dataBrowserDialog.py
@@ -20,10 +20,10 @@
 """
 import os
 
-from PyQt5 import uic
+from PyQt5 import QtCore, uic
 from PyQt5.QtWidgets import QDialog
 
-from foqus_lib.gui.flowsheet.dataBrowserFrame import *
+from foqus_lib.gui.flowsheet.dataBrowserFrame import dataBrowserFrame
 
 mypath = os.path.dirname(__file__)
 _dataBrowserDialogUI, _dataBrowserDialog = uic.loadUiType(
diff --git a/foqus_lib/gui/flowsheet/dataFilterDialog.py b/foqus_lib/gui/flowsheet/dataFilterDialog.py
index 5b2a79fee..4c9325a05 100644
--- a/foqus_lib/gui/flowsheet/dataFilterDialog.py
+++ b/foqus_lib/gui/flowsheet/dataFilterDialog.py
@@ -34,7 +34,7 @@
     QMessageBox,
 )
 
-from foqus_lib.framework.sampleResults.results import *
+from foqus_lib.framework.sampleResults.results import dataFilter
 from foqus_lib.gui.flowsheet.calculatedColumns import calculatedColumnsDialog
 
 mypath = os.path.dirname(__file__)
diff --git a/foqus_lib/gui/flowsheet/drawFlowsheet.py b/foqus_lib/gui/flowsheet/drawFlowsheet.py
index fdb7aa295..8b8e6b183 100644
--- a/foqus_lib/gui/flowsheet/drawFlowsheet.py
+++ b/foqus_lib/gui/flowsheet/drawFlowsheet.py
@@ -37,8 +37,6 @@
     QMessageBox,
 )
 
-from foqus_lib.framework.graph import *
-
 
 class fsScene(QGraphicsScene):
     """
diff --git a/foqus_lib/gui/sdoe/sdoeAnalysisDialog.py b/foqus_lib/gui/sdoe/sdoeAnalysisDialog.py
index 10855692d..d5ca515fe 100644
--- a/foqus_lib/gui/sdoe/sdoeAnalysisDialog.py
+++ b/foqus_lib/gui/sdoe/sdoeAnalysisDialog.py
@@ -16,6 +16,8 @@
 import os
 from datetime import datetime
 
+import numpy as np
+
 from PyQt5 import uic
 from PyQt5.QtCore import Qt
 from PyQt5.QtGui import QCursor
@@ -33,7 +35,7 @@
 from foqus_lib.framework.sdoe.plot_utils import plot_pareto
 
 from .sdoePreview import Window, sdoePreview
-from .sdoeSetupFrame import *
+from .sdoeSetupFrame import QComboBox, LocalExecutionModule
 
 mypath = os.path.dirname(__file__)
 _sdoeAnalysisDialogUI, _sdoeAnalysisDialog = uic.loadUiType(
diff --git a/foqus_lib/gui/sdoe/updateSDOEModelDialog.py b/foqus_lib/gui/sdoe/updateSDOEModelDialog.py
index 71becb6ec..db0f52c38 100644
--- a/foqus_lib/gui/sdoe/updateSDOEModelDialog.py
+++ b/foqus_lib/gui/sdoe/updateSDOEModelDialog.py
@@ -19,7 +19,7 @@
 from PyQt5 import uic
 from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QFileDialog, QListWidgetItem
 
-from foqus_lib.framework.uq.LocalExecutionModule import *
+from foqus_lib.framework.uq.LocalExecutionModule import LocalExecutionModule
 
 mypath = os.path.dirname(__file__)
 _updateSDOEModelDialogUI, _updateSDOEModelDialog = uic.loadUiType(
diff --git a/foqus_lib/gui/uq/Preview.py b/foqus_lib/gui/uq/Preview.py
index 0afb0f73f..96211c9bd 100644
--- a/foqus_lib/gui/uq/Preview.py
+++ b/foqus_lib/gui/uq/Preview.py
@@ -24,7 +24,7 @@
     QTableWidgetItem,
 )
 
-from foqus_lib.framework.uq.Common import *
+from foqus_lib.framework.uq.Common import Common
 from foqus_lib.framework.uq.Model import Model
 from foqus_lib.framework.uq.RSInference import RSInferencer
 from foqus_lib.framework.uq.Visualizer import Visualizer
diff --git a/foqus_lib/service/flowsheet.py b/foqus_lib/service/flowsheet.py
index c1af08263..e25cccdf0 100644
--- a/foqus_lib/service/flowsheet.py
+++ b/foqus_lib/service/flowsheet.py
@@ -38,7 +38,7 @@
 import yaml
 
 from turbine.commands import turbine_simulation_script
-from foqus_lib.framework.foqusException.foqusException import *
+from foqus_lib.framework.foqusException.foqusException import foqusException
 from foqus_lib.framework.graph.graph import Graph
 from foqus_lib.framework.graph.nodeVars import NodeVarListEx
 from foqus_lib.framework.plugins import pluginSearch