3 files changed, 5 insertions, 7 deletions
diff --git a/perllib/FixMyStreet/Map/WMTSBase.pm b/perllib/FixMyStreet/Map/WMTSBase.pm
index 960a58a41..051f8f369 100644
--- a/perllib/FixMyStreet/Map/WMTSBase.pm
+++ b/perllib/FixMyStreet/Map/WMTSBase.pm
@@ -205,15 +205,15 @@ sub get_map_hash {
         numZoomLevels => $self->zoom_parameters->{zoom_levels},
         tile_size => $self->tile_parameters->{size},
         tile_dpi => $self->tile_parameters->{dpi},
-        tile_urls => encode_json $self->tile_parameters->{urls},
+        tile_urls => encode_json( $self->tile_parameters->{urls} ),
         tile_suffix => $self->tile_parameters->{suffix},
-        layer_names => encode_json $self->tile_parameters->{layer_names},
+        layer_names => encode_json( $self->tile_parameters->{layer_names} ),
         layer_style => $self->tile_parameters->{layer_style},
         matrix_set => $self->tile_parameters->{matrix_set},
         map_projection => $self->tile_parameters->{projection},
         origin_x => force_float_format($self->tile_parameters->{origin_x}),
         origin_y => force_float_format($self->tile_parameters->{origin_y}),
-        scales => encode_json \@scales,
+        scales => encode_json( \@scales ),
     };
 }
 
diff --git a/perllib/FixMyStreet/Roles/PhotoSet.pm b/perllib/FixMyStreet/Roles/PhotoSet.pm
index 2a6863cff..4a40ef3f9 100644
--- a/perllib/FixMyStreet/Roles/PhotoSet.pm
+++ b/perllib/FixMyStreet/Roles/PhotoSet.pm
@@ -19,9 +19,8 @@ Return a PhotoSet object for all photos attached to this field
 
 sub get_photoset {
     my ($self) = @_;
-    my $class = 'FixMyStreet::App::Model::PhotoSet';
-    eval "use $class";
-    return $class->new({
+    require FixMyStreet::App::Model::PhotoSet;
+    return FixMyStreet::App::Model::PhotoSet->new({
         db_data => $self->photo,
         object => $self,
     });
diff --git a/perllib/Utils.pm b/perllib/Utils.pm
index 6ba20e9d3..e443786b3 100644
--- a/perllib/Utils.pm
+++ b/perllib/Utils.pm
@@ -12,7 +12,6 @@ package Utils;
 use strict;
 use DateTime;
 use Encode;
-use File::Slurp qw();
 use mySociety::GeoUtil;
 use mySociety::Locale;
 use FixMyStreet;