diff --git a/src/ConditionalGMM/MNorm.py b/src/ConditionalGMM/MNorm.py
index a3b91d7..08cfdc9 100644
--- a/src/ConditionalGMM/MNorm.py
+++ b/src/ConditionalGMM/MNorm.py
@@ -4,7 +4,7 @@
 import scipy.stats as ss
 
 
-class CondMNorm(object):
+class CondMNorm:
     """Conditional multivariate normal. Given a joint mean vector and
     joint covariance matrix, precompute everything that can be computed
     in order to solve conditional expressions.
diff --git a/src/ConditionalGMM/UnivariateGMM.py b/src/ConditionalGMM/UnivariateGMM.py
index 14edfb9..104c217 100644
--- a/src/ConditionalGMM/UnivariateGMM.py
+++ b/src/ConditionalGMM/UnivariateGMM.py
@@ -3,10 +3,8 @@
 import numpy as np
 import scipy as sp
 
-from ConditionalGMM.condGMM import *
 
-
-class UniGMM(object):
+class UniGMM:
     """Conditional Gaussian mixture model of a single random variable.
     This class exists to provide helpful routines, such as computing CDFs
     and PPFs of the GMM.
diff --git a/src/ConditionalGMM/condGMM.py b/src/ConditionalGMM/condGMM.py
index 031a840..f6b384b 100644
--- a/src/ConditionalGMM/condGMM.py
+++ b/src/ConditionalGMM/condGMM.py
@@ -3,10 +3,10 @@
 import numpy as np
 import scipy as sp
 
-from ConditionalGMM.MNorm import *
+from ConditionalGMM.MNorm import CondMNorm
 
 
-class CondGMM(object):
+class CondGMM:
     """Conditional Gaussian mixture model. Built from a collection of
     conditional multivariate normal (CondMNorm) distributions weighted
     to be properly normalized.