diff --git a/lib/Command/VideoSetup.php b/lib/Command/VideoSetup.php
index efde576c..01b80be1 100644
--- a/lib/Command/VideoSetup.php
+++ b/lib/Command/VideoSetup.php
@@ -55,7 +55,7 @@ class VideoSetup extends Command
         $ffprobePath = $this->config->getSystemValue('memories.ffprobe_path', 'ffprobe');
 
         // Get ffmpeg version
-        $ffmpeg = shell_exec("$ffmpegPath -version");
+        $ffmpeg = shell_exec("{$ffmpegPath} -version");
         if (false === strpos($ffmpeg, 'ffmpeg version')) {
             $ffmpeg = null;
             $output->writeln('<error>ffmpeg is not installed</error>');
@@ -64,7 +64,7 @@ class VideoSetup extends Command
         }
 
         // Get ffprobe version
-        $ffprobe = shell_exec("$ffprobePath -version");
+        $ffprobe = shell_exec("{$ffprobePath} -version");
         if (false === strpos($ffprobe, 'ffprobe version')) {
             $ffprobe = null;
             $output->writeln('<error>ffprobe is not installed</error>');
diff --git a/lib/Controller/VideoController.php b/lib/Controller/VideoController.php
index 87261372..8ad56a63 100644
--- a/lib/Controller/VideoController.php
+++ b/lib/Controller/VideoController.php
@@ -100,13 +100,15 @@ class VideoController extends ApiBase
 
             // QSV with VAAPI
             $vaapi = $this->config->getSystemValue('memories.qsv', false);
-            if ($vaapi) $env .= 'VAAPI=1 ';
+            if ($vaapi) {
+                $env .= 'VAAPI=1 ';
+            }
 
             // Paths
             $ffmpegPath = $this->config->getSystemValue('memories.ffmpeg_path', 'ffmpeg');
             $ffprobePath = $this->config->getSystemValue('memories.ffprobe_path', 'ffprobe');
             $tmpPath = $this->config->getSystemValue('memories.tmp_path', sys_get_temp_dir());
-            $env .= "FFMPEG='$ffmpegPath' FFPROBE='$ffprobePath' GOVOD_TEMPDIR='$tmpPath/go-vod' ";
+            $env .= "FFMPEG='{$ffmpegPath}' FFPROBE='{$ffprobePath}' GOVOD_TEMPDIR='{$tmpPath}/go-vod' ";
 
             // Check if already running
             exec("pkill {$transcoder}");