From 080e742d323da8de717bc92a0f4a42ff606de4e3 Mon Sep 17 00:00:00 2001
From: Olek <45364492+yardasol@users.noreply.github.com>
Date: Fri, 14 Jul 2023 11:14:25 -0500
Subject: [PATCH] Apply suggestions from @paulromano code review

Co-authored-by: Paul Romano <paul.k.romano@gmail.com>
---
 openmc/model/surface_composite.py | 35 +++++++++++--------------------
 tests/unit_tests/test_geometry.py |  1 -
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/openmc/model/surface_composite.py b/openmc/model/surface_composite.py
index 29d02f58cdf..cff612d8807 100644
--- a/openmc/model/surface_composite.py
+++ b/openmc/model/surface_composite.py
@@ -448,34 +448,23 @@ def __init__(self, center_base, height, radius, axis='z', upper_fillet_radius=0.
 
             axis_args = (axis, x1, x2, axcoord, axcoord1, axcoord2)
             if upper_fillet_radius > 0.:
-                (upper_fillet_cylinder,
-                upper_fillet_torus,
-                upper_fillet_plane) = \
-                    self._create_fillet_objects(axis_args,
-                                                height,
-                                                center_base,
-                                                radius,
-                                                upper_fillet_radius)
-                self.upper_fillet_cylinder = upper_fillet_cylinder
-                self.upper_fillet_torus = upper_fillet_torus
-                self.upper_fillet_plane = upper_fillet_plane
+                cylinder, torus, plane = self._create_fillet_objects(
+                    axis_args, height, center_base, radius, upper_fillet_radius)
+                self.upper_fillet_cylinder = cylinder
+                self.upper_fillet_torus = torus
+                self.upper_fillet_plane = plane
                 self._surface_names += ('upper_fillet_cylinder',
                                         'upper_fillet_torus',
                                         'upper_fillet_plane')
 
             if lower_fillet_radius > 0.:
-                (lower_fillet_cylinder,
-                lower_fillet_torus,
-                lower_fillet_plane) = \
-                    self._create_fillet_objects(axis_args,
-                                                height,
-                                                center_base,
-                                                radius,
-                                                lower_fillet_radius,
-                                                pos='lower')
-                self.lower_fillet_cylinder = lower_fillet_cylinder
-                self.lower_fillet_torus = lower_fillet_torus
-                self.lower_fillet_plane = lower_fillet_plane
+                cylinder, torus, plane = self._create_fillet_objects(
+                    axis_args, height, center_base, radius, lower_fillet_radius,
+                    pos='lower'
+                )
+                self.lower_fillet_cylinder = cylinder
+                self.lower_fillet_torus = torus
+                self.lower_fillet_plane = plane
 
                 self._surface_names += ('lower_fillet_cylinder',
                                         'lower_fillet_torus',
diff --git a/tests/unit_tests/test_geometry.py b/tests/unit_tests/test_geometry.py
index 456eb2b2ba2..6fa34d26d01 100644
--- a/tests/unit_tests/test_geometry.py
+++ b/tests/unit_tests/test_geometry.py
@@ -3,7 +3,6 @@
 
 import numpy as np
 import openmc
-import openmc.lib
 import pytest