diff --git a/.simplecov b/.simplecov
index 7c68b0ce1..3506f2b20 100644
--- a/.simplecov
+++ b/.simplecov
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 SimpleCov.command_name "spec:#{SPEC_ROOT.join('..').basename}"
 
 SimpleCov.root(SPEC_ROOT.join('../..').to_s)
@@ -6,4 +8,4 @@ SimpleCov.start do
   add_filter '/spec/'
   add_filter '/rom-sql/'
   add_filter '/lint/'
-end
\ No newline at end of file
+end
diff --git a/Gemfile b/Gemfile
index 01e9d5900..cf96b260e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 gemspec
 
-eval_gemfile "Gemfile.devtools"
+eval_gemfile 'Gemfile.devtools'
 
 unless defined?(COMPONENTS)
-  COMPONENTS = %w(core repository changeset)
+  COMPONENTS = %w[core repository changeset].freeze
 end
 
 COMPONENTS.each do |component|
@@ -23,13 +25,13 @@ if ENV['USE_DRY_INITIALIZER_MAIN'].eql?('true')
 end
 
 group :sql do
-  gem 'sequel', '~> 5.0'
-  gem 'sqlite3', platforms: :ruby
-  gem 'jdbc-sqlite3', platforms: :jruby
-  gem 'jdbc-postgres', platforms: :jruby
-  gem 'pg', platforms: :ruby
   gem 'dry-events', '~> 1.0'
   gem 'dry-monitor', '~> 1.0'
+  gem 'jdbc-postgres', platforms: :jruby
+  gem 'jdbc-sqlite3', platforms: :jruby
+  gem 'pg', platforms: :ruby
+  gem 'sequel', '~> 5.0'
+  gem 'sqlite3', platforms: :ruby
 
   # if ENV['USE_ROM_SQL_MASTER'].eql?('true')
   #   gem 'rom-sql', github: 'rom-rb/rom-sql', branch: 'master'
@@ -40,8 +42,8 @@ group :sql do
 end
 
 group :test do
-  gem 'rspec', '~> 3.6'
   gem 'codacy-coverage', require: false
+  gem 'rspec', '~> 3.6'
   gem 'simplecov', platforms: :ruby
   gem 'warning'
 end
@@ -65,6 +67,6 @@ end
 
 group :benchmarks do
   # gem 'hotch', platforms: :ruby
-  gem 'benchmark-ips'
   gem 'activerecord', '~> 5.0'
+  gem 'benchmark-ips'
 end
diff --git a/Rakefile b/Rakefile
index be62ec64c..08ef899b0 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,10 +1,12 @@
-require "bundler/gem_tasks"
+# frozen_string_literal: true
 
-SPEC_RESULTS = {}
+require 'bundler/gem_tasks'
+
+SPEC_RESULTS = {}.freeze
 
 desc 'Run all specs'
 task :spec do
-  %w(core repository changeset rom).map do |name|
+  %w[core repository changeset rom].map do |name|
     Rake::Task["spec:#{name}"].execute
   end
 
@@ -40,4 +42,4 @@ task default: :spec
 begin
   require 'yard-junk/rake'
   YardJunk::Rake.define_task(:text)
-rescue LoadError;end
\ No newline at end of file
+rescue LoadError; end
diff --git a/changeset/lib/rom/changeset/extensions/relation.rb b/changeset/lib/rom/changeset/extensions/relation.rb
index 4788a2d63..737b9e2e0 100644
--- a/changeset/lib/rom/changeset/extensions/relation.rb
+++ b/changeset/lib/rom/changeset/extensions/relation.rb
@@ -11,14 +11,16 @@ module Extensions
       # Changeset extenions for combined relations
       #
       # @api public
-      class Relation::Graph
-        # Build a changeset for a combined relation
-        #
-        # @raise NotImplementedError
-        #
-        # @api public
-        def changeset(*)
-          raise NotImplementedError, "Changeset doesn't support combined relations yet"
+      module Relation
+        class Graph
+          # Build a changeset for a combined relation
+          #
+          # @raise NotImplementedError
+          #
+          # @api public
+          def changeset(*)
+            raise NotImplementedError, "Changeset doesn't support combined relations yet"
+          end
         end
       end
     end
diff --git a/changeset/spec/integration/changeset_spec.rb b/changeset/spec/integration/changeset_spec.rb
index e7e1c97b9..fb28916bb 100644
--- a/changeset/spec/integration/changeset_spec.rb
+++ b/changeset/spec/integration/changeset_spec.rb
@@ -125,7 +125,7 @@ class User < Dry::Struct
         private
 
         def extend_tuple(tuple)
-          tuple.merge(title: tuple[:title] + ", yes really")
+          tuple.merge(title: "#{tuple[:title]}, yes really")
         end
       end
 
@@ -197,7 +197,7 @@ def extend_tuple(tuple)
         private
 
         def extend_tuple(tuple)
-          tuple.merge(title: tuple[:title] + ', yes really')
+          tuple.merge(title: "#{tuple[:title]}, yes really")
         end
       end
 
diff --git a/changeset/spec/shared/database.rb b/changeset/spec/shared/database.rb
index 956bbe58f..9efdb7d00 100644
--- a/changeset/spec/shared/database.rb
+++ b/changeset/spec/shared/database.rb
@@ -21,8 +21,10 @@
   include_context 'database setup'
 
   before do
-    %i[tags tasks books posts_labels posts users labels
-     reactions messages].each { |table| conn.drop_table?(table) }
+    %i[
+      tags tasks books posts_labels posts users labels
+      reactions messages
+    ].each { |table| conn.drop_table?(table) }
 
     conn.create_table :users do
       primary_key :id
diff --git a/changeset/spec/shared/seeds.rb b/changeset/spec/shared/seeds.rb
index 51b12b8a8..b1d4e8d75 100644
--- a/changeset/spec/shared/seeds.rb
+++ b/changeset/spec/shared/seeds.rb
@@ -10,8 +10,12 @@
 
     conn[:tags].insert task_id: task_id, name: 'red'
 
-    jane_post_id = conn[:posts].insert author_id: jane_id, title: 'Hello From Jane', body: 'Jane Post'
-    joe_post_id = conn[:posts].insert author_id: joe_id, title: 'Hello From Joe', body: 'Joe Post'
+    jane_post_id = conn[:posts].insert(
+      author_id: jane_id,
+      title: 'Hello From Jane',
+      body: 'Jane Post'
+    )
+    joe_post_id = conn[:posts].insert(author_id: joe_id, title: 'Hello From Joe', body: 'Joe Post')
 
     red_id = conn[:labels].insert name: 'red'
     green_id = conn[:labels].insert name: 'green'
diff --git a/changeset/spec/spec_helper.rb b/changeset/spec/spec_helper.rb
index 37451db46..5ab2524f7 100644
--- a/changeset/spec/spec_helper.rb
+++ b/changeset/spec/spec_helper.rb
@@ -34,9 +34,15 @@
 Dry::Core::Deprecations.set_logger!(SPEC_ROOT.join('../log/deprecations.log'))
 
 # Make inference errors quiet
-class ROM::SQL::Schema::Inferrer
-  def self.on_error(*args)
-    # shush
+module ROM
+  module SQL
+    module Schema
+      class Inferrer
+        def self.on_error(*args)
+          # shush
+        end
+      end
+    end
   end
 end
 
diff --git a/changeset/spec/unit/changeset_spec.rb b/changeset/spec/unit/changeset_spec.rb
index f68b5ae72..5cfb1cb9f 100644
--- a/changeset/spec/unit/changeset_spec.rb
+++ b/changeset/spec/unit/changeset_spec.rb
@@ -72,7 +72,9 @@
     it 'uses piped data for diff' do
       expect(relation).to receive(:one).and_return(jane)
 
-      changeset = ROM::Changeset::Update.new(relation).data(name: 'Jane').map { |t| { name: t[:name].upcase } }
+      changeset = ROM::Changeset::Update.new(relation).data(name: 'Jane').map do |t|
+        { name: t[:name].upcase }
+      end
 
       expect(changeset).to be_diff
     end
diff --git a/changeset/spec/unit/map_spec.rb b/changeset/spec/unit/map_spec.rb
index 7c5b0b9b0..7994b6c1c 100644
--- a/changeset/spec/unit/map_spec.rb
+++ b/changeset/spec/unit/map_spec.rb
@@ -23,8 +23,12 @@ def default_command_type
       end
 
       it 'sets up custom data pipe' do
-        expect(changeset.to_h)
-          .to eql(name: 'Jane', address_street: 'Street 1', address_city: 'NYC', address_country: 'US')
+        expect(changeset.to_h).to eql(
+          name: 'Jane',
+          address_street: 'Street 1',
+          address_city: 'NYC',
+          address_country: 'US'
+        )
       end
     end
 
@@ -35,11 +39,11 @@ def default_command_type
       end
 
       it 'sets up custom data pipe' do
-        expect(changeset.to_a)
-          .to eql([
-            { name: 'Jane', address_street: 'Street 1', address_city: 'NYC', address_country: 'US' },
-            { name: 'Joe', address_street: 'Street 2', address_city: 'KRK', address_country: 'PL' }
-          ])
+        expect(changeset.to_a).to eql([
+          { name: 'Jane', address_street: 'Street 1', address_city: 'NYC',
+            address_country: 'US' },
+          { name: 'Joe', address_street: 'Street 2', address_city: 'KRK', address_country: 'PL' }
+        ])
       end
     end
   end
diff --git a/core/Gemfile b/core/Gemfile
index 63e9f3bd6..76a6961f6 100644
--- a/core/Gemfile
+++ b/core/Gemfile
@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-eval_gemfile '../Gemfile'
\ No newline at end of file
+eval_gemfile '../Gemfile'
diff --git a/core/Guardfile b/core/Guardfile
index 88d1793e5..8b116f37e 100644
--- a/core/Guardfile
+++ b/core/Guardfile
@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 group :red_green_refactor, halt_on_fail: true do
-  guard :rspec, cmd: "rspec", all_on_start: true do
+  guard :rspec, cmd: 'rspec', all_on_start: true do
     # run all specs if Gemfile.lock is modified
     watch('Gemfile.lock') { 'spec' }
 
diff --git a/core/Rakefile b/core/Rakefile
index 5576f3b49..50e618ab3 100644
--- a/core/Rakefile
+++ b/core/Rakefile
@@ -14,11 +14,10 @@ task :"spec:isolation" do
   end
 end
 
+desc 'Run CI tasks'
 if RUBY_ENGINE != 'ruby'
-  desc 'Run CI tasks'
   task ci: %i[spec lint]
 else
-  desc 'Run CI tasks'
   task ci: %i[spec lint spec:isolation]
 end
 
diff --git a/core/benchmarks/setup.rb b/core/benchmarks/setup.rb
index d3cfa24dd..88bcae699 100644
--- a/core/benchmarks/setup.rb
+++ b/core/benchmarks/setup.rb
@@ -92,7 +92,14 @@ def verify(&block)
   end
 end
 
-DATABASE_URL = ENV.fetch('DATABASE_URL', RUBY_ENGINE == 'jruby' ? 'jdbc:postgresql://localhost/rom' : 'postgres://localhost/rom')
+DATABASE_URL = ENV.fetch(
+  'DATABASE_URL',
+  if RUBY_ENGINE == 'jruby'
+    'jdbc:postgresql://localhost/rom'
+  else
+    'postgres://localhost/rom'
+  end
+)
 
 setup = ROM::Configuration.new(:sql, DATABASE_URL)
 
@@ -244,7 +251,7 @@ class Tags < ROM::Relation[:sql]
 
 ROM_ENV = ROM.container(setup)
 
-VERIFY = ENV.fetch('VERIFY') { false }
+VERIFY = ENV.fetch('VERIFY', false)
 COUNT = ENV.fetch('COUNT', 1000).to_i
 
 USER_SEED = COUNT.times.map { |i|
diff --git a/core/lib/rom/core.rb b/core/lib/rom/core.rb
index 11aefa123..b4a815701 100644
--- a/core/lib/rom/core.rb
+++ b/core/lib/rom/core.rb
@@ -28,7 +28,6 @@
 require 'rom/create_container'
 
 # register known plugin types
-require 'rom/schema_plugin'
 
 ROM::Plugins.register(:command)
 ROM::Plugins.register(:mapper)
diff --git a/core/lib/rom/lint/test.rb b/core/lib/rom/lint/test.rb
index 868d9cef8..4d5ffa576 100644
--- a/core/lib/rom/lint/test.rb
+++ b/core/lib/rom/lint/test.rb
@@ -14,11 +14,9 @@ module Test
       # @api private
       def define_test_method(name, &block)
         define_method "test_#{name}" do
-          begin
-            instance_eval(&block)
-          rescue ROM::Lint::Linter::Failure => f
-            raise Minitest::Assertion, f.message
-          end
+          instance_eval(&block)
+        rescue ROM::Lint::Linter::Failure => e
+          raise Minitest::Assertion, e.message
         end
       end
     end
diff --git a/core/lib/rom/plugins/command/timestamps.rb b/core/lib/rom/plugins/command/timestamps.rb
index 01f61d850..63222cb58 100644
--- a/core/lib/rom/plugins/command/timestamps.rb
+++ b/core/lib/rom/plugins/command/timestamps.rb
@@ -24,6 +24,7 @@ module Command
       # @api public
       class Timestamps < Module
         attr_reader :timestamps, :datestamps
+
         def initialize(timestamps: [], datestamps: [])
           @timestamps = store_attributes(timestamps)
           @datestamps = store_attributes(datestamps)
@@ -117,7 +118,7 @@ module ClassInterface
           def timestamps(*names)
             timestamp_columns timestamp_columns.merge(names)
           end
-          alias timestamp timestamps
+          alias_method :timestamp, :timestamps
 
           # Set up attributes to datestamp when the command is called
           #
@@ -139,7 +140,7 @@ def timestamps(*names)
           def datestamps(*names)
             datestamp_columns datestamp_columns.merge(names)
           end
-          alias datestamp datestamps
+          alias_method :datestamp, :datestamps
         end
       end
     end
diff --git a/core/lib/rom/relation/class_interface.rb b/core/lib/rom/relation/class_interface.rb
index 55de44d87..c60fe340b 100644
--- a/core/lib/rom/relation/class_interface.rb
+++ b/core/lib/rom/relation/class_interface.rb
@@ -188,7 +188,7 @@ def relation_name
       #
       # @api public
       def view(*args, &block)
-        if args.size == 1 && block.arity > 0
+        if args.size == 1 && block.arity.positive?
           raise ArgumentError, 'schema attribute names must be provided as the second argument'
         end
 
@@ -206,7 +206,7 @@ def view(*args, &block)
             new_schema_fn
           end
 
-        if relation_block.arity > 0
+        if relation_block.arity.positive?
           auto_curry_guard do
             define_method(name, &relation_block)
 
diff --git a/core/lib/rom/struct.rb b/core/lib/rom/struct.rb
index 9f6390e62..8fffe17af 100644
--- a/core/lib/rom/struct.rb
+++ b/core/lib/rom/struct.rb
@@ -106,8 +106,8 @@ def respond_to_missing?(*)
 
     def method_missing(*)
       super
-    rescue NameError => error
-      raise MissingAttribute.new { "#{error.message} (attribute not loaded?)" }
+    rescue NameError => e
+      raise(MissingAttribute.new { "#{e.message} (attribute not loaded?)" })
     end
   end
 end
diff --git a/core/lib/rom/support/configurable.rb b/core/lib/rom/support/configurable.rb
index 2036a81c9..999e1e12f 100644
--- a/core/lib/rom/support/configurable.rb
+++ b/core/lib/rom/support/configurable.rb
@@ -7,7 +7,7 @@ module ROM
   # @api private
   module Configurable
     class Config
-      WRITER_REGEXP = /=$/.freeze
+      WRITER_REGEXP = /=$/
 
       # @!attribute [r] settings
       #   @return [Hash] A hash with defined settings
diff --git a/core/lib/rom/types.rb b/core/lib/rom/types.rb
index f719fb783..e58f63f00 100644
--- a/core/lib/rom/types.rb
+++ b/core/lib/rom/types.rb
@@ -8,7 +8,6 @@ module ROM
   #
   # @api public
   #
-  # rubocop:disable Naming/MethodName
   module Types
     include Dry::Types(default: :nominal)
 
@@ -44,11 +43,9 @@ def ForeignKey(relation, type = Types::Integer)
     # @api public
     def Coercible.JSONHash(symbol_keys: false, type: Types::Hash)
       Types.Constructor(type) do |value|
-        begin
-          ::JSON.parse(value.to_s, symbolize_names: symbol_keys)
-        rescue ::JSON::ParserError
-          value
-        end
+        ::JSON.parse(value.to_s, symbolize_names: symbol_keys)
+      rescue ::JSON::ParserError
+        value
       end
     end
 
diff --git a/repository/benchmarks/setup.rb b/repository/benchmarks/setup.rb
index 959414765..94b175fd6 100644
--- a/repository/benchmarks/setup.rb
+++ b/repository/benchmarks/setup.rb
@@ -22,8 +22,8 @@ def benchmark(title)
     x.config(suite: GCSuite.new)
     def x.verify(*); end
 
-    def x.prepare(*) 
-      yield 
+    def x.prepare(*)
+      yield
     end
     yield x
     x.compare!
diff --git a/repository/lib/rom/repository/class_interface.rb b/repository/lib/rom/repository/class_interface.rb
index 66cdf34f7..ff0819d29 100644
--- a/repository/lib/rom/repository/class_interface.rb
+++ b/repository/lib/rom/repository/class_interface.rb
@@ -104,9 +104,20 @@ def commands(*names, mapper: nil, use: nil, plugins_options: EMPTY_HASH, **opts)
             type, *view = Array(spec).flatten
 
             if !view.empty?
-              define_restricted_command_method(type, view, mapper: mapper, use: use, plugins_options: plugins_options)
+              define_restricted_command_method(
+                type,
+                view,
+                mapper: mapper,
+                use: use,
+                plugins_options: plugins_options
+              )
             else
-              define_command_method(type, mapper: mapper, use: use, plugins_options: plugins_options)
+              define_command_method(
+                type,
+                mapper: mapper,
+                use: use,
+                plugins_options: plugins_options
+              )
             end
           end
         else
diff --git a/repository/lib/rom/repository/relation_reader.rb b/repository/lib/rom/repository/relation_reader.rb
index c72a161f2..6405c15f4 100644
--- a/repository/lib/rom/repository/relation_reader.rb
+++ b/repository/lib/rom/repository/relation_reader.rb
@@ -44,7 +44,12 @@ def initialize(klass, relations)
         @relations = relations
         mutex.synchronize do
           unless self.class.relation_readers
-            self.class.relation_readers(build_relation_readers(relations, self.class.relation_cache))
+            self.class.relation_readers(
+              build_relation_readers(
+                relations,
+                self.class.relation_cache
+              )
+            )
           end
         end
         klass.include self.class.relation_readers
@@ -56,7 +61,6 @@ def included(klass)
         klass.include(InstanceMethods)
       end
 
-
       private
 
       # @api private
diff --git a/repository/rom-repository.gemspec b/repository/rom-repository.gemspec
index 6c919433a..7b2b41a45 100644
--- a/repository/rom-repository.gemspec
+++ b/repository/rom-repository.gemspec
@@ -20,8 +20,8 @@ Gem::Specification.new do |gem|
     'bug_tracker_uri' => 'https://github.com/rom-rb/rom/issues'
   }
 
-  gem.add_runtime_dependency 'dry-initializer', '~> 3.0', '>= 3.0.1'
   gem.add_runtime_dependency 'dry-core', '~> 1.0'
+  gem.add_runtime_dependency 'dry-initializer', '~> 3.0', '>= 3.0.1'
   gem.add_runtime_dependency 'rom-core', '~> 5.3', '>= 5.3.3'
 
   gem.add_development_dependency 'rake', '~> 11.2'
diff --git a/repository/spec/integration/command_macros_spec.rb b/repository/spec/integration/command_macros_spec.rb
index dc7bcf020..e8d5326de 100644
--- a/repository/spec/integration/command_macros_spec.rb
+++ b/repository/spec/integration/command_macros_spec.rb
@@ -123,7 +123,10 @@
     struct_definition = [:users, [repo.users.schema[:id].to_read_ast,
                                   repo.users.schema[:name].to_read_ast]]
 
-    expect(user).to be_an_instance_of repo.users.mappers.compiler.struct_compiler[*struct_definition, ROM::Struct]
+    expect(user).to be_an_instance_of repo.users.mappers.compiler.struct_compiler[
+      *struct_definition,
+      ROM::Struct
+    ]
   end
 
   describe 'using plugins' do
@@ -153,7 +156,10 @@
 
     it 'allows to pass options to plugins' do
       repo = Class.new(ROM::Repository[:users]) do
-        commands :create, update: :by_pk, use: %i[modify_name timestamps], plugins_options: { modify_name: { reverse: true } }
+        commands :create,
+                 update: :by_pk,
+                 use: %i[modify_name timestamps],
+                 plugins_options: { modify_name: { reverse: true } }
       end.new(rom)
 
       user = repo.create(name: 'Jane')
diff --git a/repository/spec/integration/multi_adapter_spec.rb b/repository/spec/integration/multi_adapter_spec.rb
index 802edff9b..078a7e8b4 100644
--- a/repository/spec/integration/multi_adapter_spec.rb
+++ b/repository/spec/integration/multi_adapter_spec.rb
@@ -15,8 +15,10 @@
   let(:repo) { Test::Repository.new(rom) }
 
   before do
-    %i[tags tasks books posts_labels posts users labels
-     reactions messages].each { |table| sql_conn.drop_table?(table) }
+    %i[
+      tags tasks books posts_labels posts users labels
+      reactions messages
+    ].each { |table| sql_conn.drop_table?(table) }
 
     sql_conn.create_table :users do
       primary_key :id
diff --git a/repository/spec/integration/repository_spec.rb b/repository/spec/integration/repository_spec.rb
index 0084aba10..80f1ba81e 100644
--- a/repository/spec/integration/repository_spec.rb
+++ b/repository/spec/integration/repository_spec.rb
@@ -138,7 +138,10 @@
   end
 
   it 'loads an aggregate with multiple nodes and deeply nested assoc options' do
-    jane = repo.root.combine(:books, posts: [{ author: { labels: :posts } }]).where(name: 'Jane').one
+    jane = repo.root.combine(
+      :books,
+      posts: [{ author: { labels: :posts } }]
+    ).where(name: 'Jane').one
 
     expect(jane.books).to be_empty
 
@@ -315,8 +318,10 @@
         end
 
         it 'returns a nested hash for an aggregate' do
-          expect(repo.root.combine(:posts).limit(1).one)
-            .to eql(id: 1, name: 'Jane', posts: [{ id: 1, author_id: 1, title: 'Hello From Jane', body: 'Jane Post' }])
+          expect(repo.root.combine(:posts).limit(1).one).to eql(
+            id: 1, name: 'Jane',
+            posts: [{ id: 1, author_id: 1, title: 'Hello From Jane', body: 'Jane Post' }]
+          )
         end
       end
     end
@@ -385,7 +390,9 @@ def call(rel)
   describe 'using a custom model for a node' do
     before do
       require 'ostruct'
-      class Test::Post < OpenStruct; end
+      module Test
+        class Post < OpenStruct; end
+      end
     end
 
     it 'uses provided model for the member type' do
diff --git a/repository/spec/integration/typed_structs_spec.rb b/repository/spec/integration/typed_structs_spec.rb
index 6ec992002..8ca810352 100644
--- a/repository/spec/integration/typed_structs_spec.rb
+++ b/repository/spec/integration/typed_structs_spec.rb
@@ -39,7 +39,7 @@
         schema(:books, infer: true) do
           attribute :title,
                     ROM::Types::Coercible::String.meta(
-                      read: ROM::Types::Symbol.constructor { |s| (s + '!').to_sym }
+                      read: ROM::Types::Symbol.constructor { |s| "#{s}!".to_sym }
                     )
         end
       end
diff --git a/repository/spec/shared/database.rb b/repository/spec/shared/database.rb
index c8542b4a0..f7b0f18ee 100644
--- a/repository/spec/shared/database.rb
+++ b/repository/spec/shared/database.rb
@@ -16,8 +16,10 @@
   include_context 'database setup'
 
   before do
-    %i[tags tasks books posts_labels posts users labels
-     reactions messages].each { |table| conn.drop_table?(table) }
+    %i[
+      tags tasks books posts_labels posts users labels
+      reactions messages
+    ].each { |table| conn.drop_table?(table) }
 
     conn.create_table :users do
       primary_key :id
diff --git a/repository/spec/shared/seeds.rb b/repository/spec/shared/seeds.rb
index 51b12b8a8..f2a7dba8e 100644
--- a/repository/spec/shared/seeds.rb
+++ b/repository/spec/shared/seeds.rb
@@ -10,8 +10,16 @@
 
     conn[:tags].insert task_id: task_id, name: 'red'
 
-    jane_post_id = conn[:posts].insert author_id: jane_id, title: 'Hello From Jane', body: 'Jane Post'
-    joe_post_id = conn[:posts].insert author_id: joe_id, title: 'Hello From Joe', body: 'Joe Post'
+    jane_post_id = conn[:posts].insert(
+      author_id: jane_id,
+      title: 'Hello From Jane',
+      body: 'Jane Post'
+    )
+    joe_post_id = conn[:posts].insert(
+      author_id: joe_id,
+      title: 'Hello From Joe',
+      body: 'Joe Post'
+    )
 
     red_id = conn[:labels].insert name: 'red'
     green_id = conn[:labels].insert name: 'green'
diff --git a/rom.gemspec b/rom.gemspec
index 216dff9e3..5bfa210eb 100644
--- a/rom.gemspec
+++ b/rom.gemspec
@@ -1,4 +1,6 @@
-require File.expand_path('../lib/rom/version', __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('lib/rom/version', __dir__)
 
 Gem::Specification.new do |gem|
   gem.name        = 'rom'
@@ -11,15 +13,15 @@ Gem::Specification.new do |gem|
   gem.files       = Dir['CHANGELOG.md', 'LICENSE', 'README.md', 'lib/**/*']
   gem.license     = 'MIT'
   gem.metadata    = {
-    'source_code_uri'   => 'https://github.com/rom-rb/rom',
+    'source_code_uri' => 'https://github.com/rom-rb/rom',
     'documentation_uri' => 'https://api.rom-rb.org/rom/',
-    'mailing_list_uri'  => 'https://discourse.rom-rb.org/',
-    'bug_tracker_uri'   => 'https://github.com/rom-rb/rom/issues',
+    'mailing_list_uri' => 'https://discourse.rom-rb.org/',
+    'bug_tracker_uri' => 'https://github.com/rom-rb/rom/issues'
   }
 
+  gem.add_runtime_dependency 'rom-changeset', '~> 5.3', '>= 5.3.0'
   gem.add_runtime_dependency 'rom-core', '~> 5.3', '>= 5.3.3'
   gem.add_runtime_dependency 'rom-repository', '~> 5.3', '>= 5.3.1'
-  gem.add_runtime_dependency 'rom-changeset', '~> 5.3', '>= 5.3.0'
 
   gem.add_development_dependency 'rake', '~> 13.0'
   gem.add_development_dependency 'rspec', '~> 3.5'
diff --git a/spec/integration/gateways/gateway_params_spec.rb b/spec/integration/gateways/gateway_params_spec.rb
index 6a7cd3dcd..ae61930cc 100644
--- a/spec/integration/gateways/gateway_params_spec.rb
+++ b/spec/integration/gateways/gateway_params_spec.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe "Gateways / keyword arguments" do
+RSpec.describe 'Gateways / keyword arguments' do
   before do
     @adapter = Module.new
     class @adapter::Gateway