Resolve additional rubocop warnings