diff --git a/config/unicorn.rb b/config/unicorn.rb
index b156900..cc2d337 100644
--- a/config/unicorn.rb
+++ b/config/unicorn.rb
@@ -1,7 +1,5 @@
-# https://devcenter.heroku.com/articles/rails-unicorn
-
-worker_processes (ENV['WEB_CONCURRENCY'] || 3).to_i
-timeout (ENV['WEB_TIMEOUT'] || 5).to_i
+worker_processes Integer(ENV["WEB_CONCURRENCY"] || 3)
+timeout 15
 preload_app true
 
 before_fork do |server, worker|
@@ -10,20 +8,15 @@ before_fork do |server, worker|
     Process.kill 'QUIT', Process.pid
   end
 
-  if defined? ActiveRecord::Base
-    ActiveRecord::Base.connection.disconnect!
-  end
+  defined?(ActiveRecord::Base) and
+      ActiveRecord::Base.connection.disconnect!
 end
 
 after_fork do |server, worker|
   Signal.trap 'TERM' do
-    puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to sent QUIT'
+    puts 'Unicorn worker intercepting TERM and doing nothing. Wait for master to send QUIT'
   end
 
-  if defined? ActiveRecord::Base
-    config = Rails.application.config.database_configuration[Rails.env]
-    config['reaping_frequency'] = (ENV['DB_REAPING_FREQUENCY'] || 10).to_i
-    config['pool'] = (ENV['DB_POOL'] || 2).to_i
-    ActiveRecord::Base.establish_connection(config)
-  end
-end
+  defined?(ActiveRecord::Base) and
+      ActiveRecord::Base.establish_connection
+end
\ No newline at end of file