diff --git a/src/Nulpunkt/Yesql/Statement/MapInput.php b/src/Nulpunkt/Yesql/Statement/MapInput.php
index 6f2b915..741af37 100644
--- a/src/Nulpunkt/Yesql/Statement/MapInput.php
+++ b/src/Nulpunkt/Yesql/Statement/MapInput.php
@@ -4,14 +4,10 @@
 
 class MapInput implements Statement
 {
-    private $statement;
-    private $modline;
+    private $inFunc;
 
-    public function __construct($statement, $modline, $argNames)
+    public function __construct(private $statement, private $modline, private $argNames)
     {
-        $this->statement = $statement;
-        $this->modline = $modline;
-        $this->argNames = $argNames;
         $this->inFunc = $this->getInFunc();
     }
 
diff --git a/src/Nulpunkt/Yesql/Statement/Select.php b/src/Nulpunkt/Yesql/Statement/Select.php
index 47ae3bf..b323318 100644
--- a/src/Nulpunkt/Yesql/Statement/Select.php
+++ b/src/Nulpunkt/Yesql/Statement/Select.php
@@ -4,15 +4,12 @@
 
 class Select implements Statement
 {
-    private $sql;
-    private $modline;
     private $rowFunc;
+    private $rowClass;
     private $stmt;
 
-    public function __construct($sql, $modline)
+    public function __construct(private $sql, private $modline)
     {
-        $this->sql = $sql;
-        $this->modline = $modline;
         $this->rowFunc = $this->getRowFunc();
         $this->rowClass = $this->getRowClass();
     }