diff --git a/features/support/env.rb b/features/support/env.rb
index 42c1dc5..6f88264 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -1,25 +1,27 @@
+# frozen_string_literal: true
+
 require 'simplecov'
 SimpleCov.start
 
 require_relative '../../.env'
-ENV["DB_NAME"] = "test_#{ENV["DB_NAME"]}"
+ENV['DB_NAME'] = "test_#{ENV.fetch('DB_NAME', nil)}"
 require_relative '../../app'
 require 'rubygems'
 require 'roda'
 require 'sequel'
 require 'capybara'
 require 'capybara/dsl'
+require 'capybara/cucumber'
 require 'rspec'
+###
+require 'rspec/expectations'
+require 'rspec/matchers'
 
 # DB initialization
 Sequel.extension :migration
-Sequel.sqlite("db/#{ENV['DB_NAME']}") do |db|
-  Sequel::Migrator.apply(db, "db/migrations")
+Sequel.sqlite("db/#{ENV.fetch('DB_NAME', nil)}") do |db|
+  Sequel::Migrator.apply(db, 'db/migrations')
 end
 
 # attach app to Capybara
 Capybara.app = App
-
-include Capybara::DSL
-include RSpec::Expectations
-include RSpec::Matchers