diff --git a/src/pvv/side/dbactivity.php b/src/pvv/side/dbactivity.php
index 4fd997a..91c0d4f 100644
--- a/src/pvv/side/dbactivity.php
+++ b/src/pvv/side/dbactivity.php
@@ -56,15 +56,41 @@ class DBActivity implements Activity {
   }
 
   public function getNextEventFrom(\DateTimeImmutable $date): ?Event {
-    $query
-      = 'SELECT id,name,start,stop,organiser,location,description FROM events WHERE start > :date ORDER BY start ASC LIMIT 1';
+    $query = '
+      SELECT
+        id,
+        name,
+        start,
+        stop,
+        organiser,
+        location,
+        description
+      FROM events
+      WHERE
+        start > :date
+      ORDER BY start ASC
+      LIMIT 1
+    ';
 
     return $this->retrieve($date, $query);
   }
 
   public function getPreviousEventFrom(\DateTimeImmutable $date): ?Event {
-    $query
-      = 'SELECT id,name,start,stop,organiser,location,description FROM events WHERE start < :date ORDER BY start DESC LIMIT 1';
+    $query = '
+      SELECT
+        id,
+        name,
+        start,
+        stop,
+        organiser,
+        location,
+        description
+      FROM events
+      WHERE
+        start < :date
+      ORDER BY start DESC
+      LIMIT 1
+    ';
 
     return $this->retrieve($date, $query);
   }
diff --git a/src/pvv/side/door.php b/src/pvv/side/door.php
index eb79f89..149a415 100644
--- a/src/pvv/side/door.php
+++ b/src/pvv/side/door.php
@@ -19,7 +19,13 @@ class Door {
    * @return array{time: DateTimeImmutable, open: bool}[]
    */
   public function getAll(): array {
-    $query = 'SELECT time, open FROM door ORDER BY time DESC';
+    $query = '
+      SELECT
+        time,
+        open
+      FROM door
+      ORDER BY time DESC
+    ';
     $statement = $this->pdo->prepare($query);
     $statement->execute();
 
@@ -40,8 +46,14 @@ class Door {
   public function getEntriesAfter(\DateTimeImmutable $startTime): array {
     $timestamp = $startTime->getTimestamp();
 
-    $query
-      = 'SELECT time, open FROM door WHERE time > :startTime ORDER BY time DESC';
+    $query = '
+      SELECT
+        time,
+        open
+      FROM door
+      WHERE time > :startTime
+      ORDER BY time DESC
+    ';
     $statement = $this->pdo->prepare($query);
     $statement->bindParam(':startTime', $timestamp, \PDO::PARAM_INT);
     $statement->execute();
@@ -61,7 +73,14 @@ class Door {
    * @return array{time: DateTimeImmutable, open: bool}
    */
   public function getCurrent(): array {
-    $query = 'SELECT time, open FROM door ORDER BY time DESC LIMIT 1';
+    $query = '
+      SELECT
+        time,
+        open
+      FROM door
+      ORDER BY time DESC
+      LIMIT 1
+    ';
     $statement = $this->pdo->prepare($query);
     $statement->execute();
     $row = $statement->fetch();
diff --git a/src/pvv/side/motd.php b/src/pvv/side/motd.php
index 8c96319..20a732c 100644
--- a/src/pvv/side/motd.php
+++ b/src/pvv/side/motd.php
@@ -28,8 +28,14 @@ class MOTD {
    * @return array{title: string, content: string[]}
    */
   public function getMOTD(): array {
-    $query
-      = 'SELECT motd.title, motd.content FROM motd ORDER BY motd.id DESC LIMIT 1';
+    $query = '
+      SELECT
+        title,
+        content
+      FROM motd
+      ORDER BY id DESC
+      LIMIT 1
+    ';
     $statement = $this->pdo->prepare($query);
     $statement->execute();
 
@@ -42,8 +48,14 @@ class MOTD {
    * @return array{title: string, content: string[]}
    */
   public function getMOTD_history(int $limit = 5): array {
-    $query
-      = 'SELECT motd.title, motd.content FROM motd ORDER BY motd.id DESC LIMIT :limit';
+    $query = '
+      SELECT
+        title,
+        content
+      FROM motd
+      ORDER BY id DESC
+      LIMIT :limit
+    ';
     $statement = $this->pdo->prepare($query);
     $statement->bindParam(':limit', $limit, \PDO::PARAM_STR);
     $statement->execute();