diff --git a/Gemfile b/Gemfile
index 6c68d885ffd953f367886a7a0242914294c67144..a8dc3cf34b3da2dbef607af5f6ca055ed16d4a67 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,8 +3,8 @@
 source "https://rubygems.org"
 gem "amazing_print"
 gem "blather", git: "https://github.com/adhearsion/blather.git", branch: "develop"
-gem "dhall"
 gem "csv"
+gem "dhall"
 gem "em-hiredis"
 gem "em-http-request", git: "https://github.com/singpolyma/em-http-request", branch: "fix-letsencrypt"
 gem "em_promise.rb"
@@ -12,6 +12,8 @@ gem "ougai"
 gem "savon"
 gem "sentry-ruby", "<= 4.3.1"
 
-gem "pry"
-gem "pry-byebug"
-gem "rubocop"
+group(:development) do
+	gem "pry"
+	gem "pry-byebug"
+	gem "rubocop"
+end
diff --git a/sgx_endstream.rb b/sgx_endstream.rb
index c6ac1fb1aa995c3a216bd9461d59d8ac9818e2a4..d56183603a8370f45a2014362a82e1dd2d9c44cd 100755
--- a/sgx_endstream.rb
+++ b/sgx_endstream.rb
@@ -260,6 +260,14 @@ iq type: [:get, :set] do |iq|
 	self << iq.as_error("service-unavailable", :cancel)
 end
 
-trap(:INT) { @shutdown_requested = true; EM.stop }
-trap(:TERM) { @shutdown_requested = true; EM.stop }
+trap(:INT) do
+	@shutdown_requested = true
+	EM.stop
+end
+
+trap(:TERM) do
+	@shutdown_requested = true
+	EM.stop
+end
+
 EM.run { client.run }