diff --git a/lib/measures/urban_geometry_creation/measure.rb b/lib/measures/urban_geometry_creation/measure.rb
index 984c022..fca6362 100644
--- a/lib/measures/urban_geometry_creation/measure.rb
+++ b/lib/measures/urban_geometry_creation/measure.rb
@@ -113,7 +113,8 @@ def run(model, runner, user_arguments)
       @runner.registerWarning("Surface elevation not set for building '#{name}'")
     end
 
-    if feature.type == 'Building'
+    case feature.type
+    when 'Building'
       # make requested building
       # pass in scaled_footprint_area (calculated from floor_area / number_of_stories)
       scaled_footprint_area = 0
@@ -170,7 +171,7 @@ def run(model, runner, user_arguments)
         URBANopt::GeoJSON::Helper.convert_to_shading_surface_group(space)
       end
 
-    elsif feature.type == 'District System'
+    when 'District System'
       district_system_type = feature[:properties][:district_system_type]
       if district_system_type == 'Community Photovoltaic'
         shading_surfaces = URBANopt::GeoJSON::Helper.create_photovoltaics(feature, 0, model, @origin_lat_lon, @runner)
diff --git a/lib/measures/urban_geometry_creation/tests/shadowed_tests.rb b/lib/measures/urban_geometry_creation/tests/shadowed_tests.rb
index 5acc5b6..eba81fb 100644
--- a/lib/measures/urban_geometry_creation/tests/shadowed_tests.rb
+++ b/lib/measures/urban_geometry_creation/tests/shadowed_tests.rb
@@ -9,7 +9,7 @@
 require 'openstudio/ruleset/ShowRunnerOutput'
 require 'urbanopt/geojson'
 require 'minitest/autorun'
-require_relative '../measure.rb'
+require_relative '../measure'
 require 'fileutils'
 
 class UrbanGeometryCreationTest < MiniTest::Unit::TestCase
diff --git a/lib/measures/urban_geometry_creation/tests/urban_geometry_creation_test.rb b/lib/measures/urban_geometry_creation/tests/urban_geometry_creation_test.rb
index 248e07b..363c8dd 100644
--- a/lib/measures/urban_geometry_creation/tests/urban_geometry_creation_test.rb
+++ b/lib/measures/urban_geometry_creation/tests/urban_geometry_creation_test.rb
@@ -9,7 +9,7 @@
 require 'openstudio/ruleset/ShowRunnerOutput'
 require 'urbanopt/geojson'
 require 'minitest/autorun'
-require_relative '../measure.rb'
+require_relative '../measure'
 require 'fileutils'
 
 class UrbanGeometryCreationTest < MiniTest::Unit::TestCase