diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 2a70e4d..e9e950a 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -3,3 +3,6 @@
 
 # Scala Steward: Reformat with scalafmt 3.6.1
 bf8eae770fdbfdf7d916e38003c3f6c9ec8a4ec6
+
+# Scala Steward: Reformat with scalafmt 3.8.4
+5acb8fc1190081379531b812cf0b7435293b9d68
diff --git a/.scalafmt.conf b/.scalafmt.conf
index f908b18..7a0b341 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,7 +1,7 @@
 # initial version taken over from alpakka
 # https://akka.io/blog/2019/09/09/akka-family-builds
 
-version = 3.8.3
+version = 3.8.4
 runner.dialect = "scala213"
 style = defaultWithAlign
 
diff --git a/src/main/scala/io/waylay/influxdb/Influx.scala b/src/main/scala/io/waylay/influxdb/Influx.scala
index 1a05265..5b564fb 100644
--- a/src/main/scala/io/waylay/influxdb/Influx.scala
+++ b/src/main/scala/io/waylay/influxdb/Influx.scala
@@ -16,29 +16,29 @@ object Influx {
   case class IString(value: String)   extends IFieldValue
 
   case class IPoint(
-    measurementName: String,
-    tags: Seq[(String, String)],
-    fields: Seq[(String, IFieldValue)],
-    timestamp: Instant
+      measurementName: String,
+      tags: Seq[(String, String)],
+      fields: Seq[(String, IFieldValue)],
+      timestamp: Instant
   )
 
   case class Serie(
-    name: String,
-    tags: Option[Map[String, String]],
-    columns: Seq[String],
-    values: Option[Seq[Seq[Option[IFieldValue]]]]
+      name: String,
+      tags: Option[Map[String, String]],
+      columns: Seq[String],
+      values: Option[Seq[Seq[Option[IFieldValue]]]]
   )
 
   // we could probably split this up in SeriesResult and ErrorResult
   case class Result(
-    series: Option[Seq[Serie]],
-    error: Option[String]
+      series: Option[Seq[Serie]],
+      error: Option[String]
   )
 
   // we should probably split this up in QueryResults and QueryError
   case class Results(
-    results: Option[Seq[Result]],
-    error: Option[String]
+      results: Option[Seq[Result]],
+      error: Option[String]
   ) {
     lazy val allErrors: Seq[String] =
       error.toSeq ++ results.getOrElse(Seq.empty).flatMap(_.error)
diff --git a/src/main/scala/io/waylay/influxdb/InfluxDB.scala b/src/main/scala/io/waylay/influxdb/InfluxDB.scala
index 653bc6f..eeabcff 100644
--- a/src/main/scala/io/waylay/influxdb/InfluxDB.scala
+++ b/src/main/scala/io/waylay/influxdb/InfluxDB.scala
@@ -178,14 +178,14 @@ object InfluxDB {
 }
 
 class InfluxDB(
-  ws: StandaloneWSClient,
-  host: String = "localhost",
-  port: Int = InfluxDB.DEFAULT_PORT,
-  username: String = "root",
-  password: String = "root",
-  // var database: String = "",
-  schema: String = "http",
-  defaultRetention: String = "INF"
+    ws: StandaloneWSClient,
+    host: String = "localhost",
+    port: Int = InfluxDB.DEFAULT_PORT,
+    username: String = "root",
+    password: String = "root",
+    // var database: String = "",
+    schema: String = "http",
+    defaultRetention: String = "INF"
 )(implicit ec: ExecutionContext) {
 
   import InfluxDB._
@@ -227,10 +227,10 @@ class InfluxDB(
       .flatMap(getResultsFromResponse)
 
   def query(
-    databaseName: String,
-    query: String,
-    chunkSize: Option[Int] = None,
-    epoch: Option[Epoch] = None
+      databaseName: String,
+      query: String,
+      chunkSize: Option[Int] = None,
+      epoch: Option[Epoch] = None
   ): Future[Results] = {
     logger.debug(query)
 
@@ -271,10 +271,10 @@ class InfluxDB(
   // https://docs.influxdata.com/influxdb/v0.9/write_protocols/write_syntax/
   //
   def storeAndMakeDbIfNeeded(
-    databaseName: String,
-    points: Seq[IPoint],
-    createDbIfNeeded: Boolean = true,
-    precision: TimeUnit = MILLISECONDS
+      databaseName: String,
+      points: Seq[IPoint],
+      createDbIfNeeded: Boolean = true,
+      precision: TimeUnit = MILLISECONDS
   ): Future[Unit] = {
     val data = WriteProtocol.write(precision, points: _*)
     logger.debug(s"storing data to $databaseName\n$data")
diff --git a/src/main/scala/io/waylay/influxdb/InfluxDB2.scala b/src/main/scala/io/waylay/influxdb/InfluxDB2.scala
index ccd4128..5a42a7f 100644
--- a/src/main/scala/io/waylay/influxdb/InfluxDB2.scala
+++ b/src/main/scala/io/waylay/influxdb/InfluxDB2.scala
@@ -15,13 +15,13 @@ import scala.concurrent.{ExecutionContext, Future}
 import scala.util.Try
 
 class InfluxDB2(
-  ws: StandaloneWSClient,
-  host: String = "localhost",
-  org: String,
-  token: String,
-  port: Int = InfluxDB.DEFAULT_PORT,
-  schema: String = "http",
-  defaultRetention: String = "INF"
+    ws: StandaloneWSClient,
+    host: String = "localhost",
+    org: String,
+    token: String,
+    port: Int = InfluxDB.DEFAULT_PORT,
+    schema: String = "http",
+    defaultRetention: String = "INF"
 )(implicit ec: ExecutionContext) {
   import InfluxDB._
 
@@ -55,10 +55,10 @@ class InfluxDB2(
     }
 
   def storeAndMakeBucketIfNeeded(
-    bucketName: String,
-    points: Seq[IPoint],
-    createDbIfNeeded: Boolean = true,
-    precision: TimeUnit = MILLISECONDS
+      bucketName: String,
+      points: Seq[IPoint],
+      createDbIfNeeded: Boolean = true,
+      precision: TimeUnit = MILLISECONDS
   ): Future[Unit] = {
     val data = WriteProtocol.write(precision, points: _*)
     logger.debug(s"storing data to $bucketName\n$data")
@@ -127,10 +127,10 @@ class InfluxDB2(
 
   }
   def query(
-    bucketName: String,
-    query: String,
-    chunkSize: Option[Int] = None,
-    epoch: Option[Epoch] = None
+      bucketName: String,
+      query: String,
+      chunkSize: Option[Int] = None,
+      epoch: Option[Epoch] = None
   ): Future[Results] = {
     logger.debug(query)
 
@@ -208,9 +208,9 @@ class InfluxDB2(
   }
 
   private def authenticatedUrlForBucket(
-    bucketName: String,
-    method: Method,
-    precision: TimeUnit = MILLISECONDS
+      bucketName: String,
+      method: Method,
+      precision: TimeUnit = MILLISECONDS
   ) = {
     val influxPrecision = precision match {
       case MILLISECONDS => "ms"
diff --git a/src/main/scala/io/waylay/influxdb/query/InfluxQueryBuilder.scala b/src/main/scala/io/waylay/influxdb/query/InfluxQueryBuilder.scala
index fd1f889..0cba22d 100644
--- a/src/main/scala/io/waylay/influxdb/query/InfluxQueryBuilder.scala
+++ b/src/main/scala/io/waylay/influxdb/query/InfluxQueryBuilder.scala
@@ -10,22 +10,22 @@ import java.time.Instant
 object InfluxQueryBuilder extends SharedProtocol {
 
   def simple(
-    fields: Seq[String],
-    tagSelector: (String, String),
-    measurement: String,
-    interval: Interval = Interval.beginningOfTimeUntilNow,
-    order: Order = Order.defaultOrder,
-    limit: Option[Long] = None
+      fields: Seq[String],
+      tagSelector: (String, String),
+      measurement: String,
+      interval: Interval = Interval.beginningOfTimeUntilNow,
+      order: Order = Order.defaultOrder,
+      limit: Option[Long] = None
   ): String =
     simpleMultipleMeasurements(fields, tagSelector, Seq(measurement), interval, order, limit)
 
   def simpleMultipleMeasurements(
-    fields: Seq[String],
-    tagSelector: (String, String),
-    measurements: Seq[String],
-    interval: Interval = Interval.beginningOfTimeUntilNow,
-    order: Order = Order.defaultOrder,
-    limit: Option[Long] = None
+      fields: Seq[String],
+      tagSelector: (String, String),
+      measurements: Seq[String],
+      interval: Interval = Interval.beginningOfTimeUntilNow,
+      order: Order = Order.defaultOrder,
+      limit: Option[Long] = None
   ): String = {
     val selects            = fields.map(escapeValue).mkString(", ")
     val measurementsString = measurements.map(escapeValue).mkString(", ")
@@ -42,26 +42,26 @@ object InfluxQueryBuilder extends SharedProtocol {
   }
 
   def grouped(
-    func: IFunction,
-    tagSelector: (String, String),
-    measurement: String,
-    grouping: Duration,
-    interval: Interval = Interval.beginningOfTimeUntilNow,
-    filter: Option[IFilter] = None,
-    limit: Option[Long] = None
+      func: IFunction,
+      tagSelector: (String, String),
+      measurement: String,
+      grouping: Duration,
+      interval: Interval = Interval.beginningOfTimeUntilNow,
+      filter: Option[IFilter] = None,
+      limit: Option[Long] = None
   ): String = groupedMultiple(Seq(func), tagSelector, measurement, grouping, interval, filter, limit)
 
   /**
    * Variation of grouped that can take multiple IFunctions
    */
   def groupedMultiple(
-    funcs: Seq[IFunction],
-    tagSelector: (String, String),
-    measurement: String,
-    grouping: Duration,
-    interval: Interval = Interval.beginningOfTimeUntilNow,
-    filter: Option[IFilter] = None,
-    limit: Option[Long] = None
+      funcs: Seq[IFunction],
+      tagSelector: (String, String),
+      measurement: String,
+      grouping: Duration,
+      interval: Interval = Interval.beginningOfTimeUntilNow,
+      filter: Option[IFilter] = None,
+      limit: Option[Long] = None
   ): String = {
 
     if (funcs.isEmpty) {