diff --git a/cli/Valet/Brew.php b/cli/Valet/Brew.php
index 46f0669..d9d8402 100644
--- a/cli/Valet/Brew.php
+++ b/cli/Valet/Brew.php
@@ -155,7 +155,7 @@ function linkedPhp()
      */
     function restartLinkedPhp()
     {
-        return $this->restartService($this->linkedPhp());
+        $this->restartService($this->linkedPhp());
     }
 
     /**
diff --git a/cli/Valet/Caddy.php b/cli/Valet/Caddy.php
index 6f92437..464c5b0 100644
--- a/cli/Valet/Caddy.php
+++ b/cli/Valet/Caddy.php
@@ -13,7 +13,6 @@ class Caddy
      *
      * @param  CommandLine  $cli
      * @param  Filesystem  $files
-     * @return void
      */
     function __construct(CommandLine $cli, Filesystem $files)
     {
diff --git a/cli/Valet/Configuration.php b/cli/Valet/Configuration.php
index 0298b6d..d2c4a7b 100644
--- a/cli/Valet/Configuration.php
+++ b/cli/Valet/Configuration.php
@@ -9,8 +9,7 @@ class Configuration
     /**
      * Create a new Valet configuration class instance.
      *
-     * @param  Filesystem  $filesystem
-     * @return void
+     * @param Filesystem $filesystem
      */
     function __construct(Filesystem $files)
     {
@@ -105,7 +104,7 @@ function addPath($path, $prepend = false)
      */
     function prependPath($path)
     {
-        return $this->addPath($path, true);
+        $this->addPath($path, true);
     }
 
     /**
diff --git a/cli/Valet/Filesystem.php b/cli/Valet/Filesystem.php
index adce3b3..d12f647 100644
--- a/cli/Valet/Filesystem.php
+++ b/cli/Valet/Filesystem.php
@@ -167,7 +167,7 @@ function append($path, $contents, $owner = null)
      */
     function appendAsUser($path, $contents)
     {
-        return $this->append($path, $contents, user());
+        $this->append($path, $contents, user());
     }
 
     /**
diff --git a/cli/Valet/PhpFpm.php b/cli/Valet/PhpFpm.php
index e833f75..727c0a2 100644
--- a/cli/Valet/PhpFpm.php
+++ b/cli/Valet/PhpFpm.php
@@ -2,8 +2,8 @@
 
 namespace Valet;
 
-use DomainException;
 use Exception;
+use DomainException;
 use Symfony\Component\Process\Process;
 
 class PhpFpm
diff --git a/cli/Valet/Site.php b/cli/Valet/Site.php
index 6f2ef17..448cde0 100644
--- a/cli/Valet/Site.php
+++ b/cli/Valet/Site.php
@@ -14,7 +14,6 @@ class Site
      * @param  Configuration  $config
      * @param  CommandLine  $cli
      * @param  Filesystem  $files
-     * @return void
      */
     function __construct(Configuration $config, CommandLine $cli, Filesystem $files)
     {
@@ -27,7 +26,7 @@ function __construct(Configuration $config, CommandLine $cli, Filesystem $files)
      * Link the current working directory with the given name.
      *
      * @param  string  $target
-     * @param  string  $name
+     * @param  string  $link
      * @return string
      */
     function link($target, $link)
diff --git a/cli/Valet/Valet.php b/cli/Valet/Valet.php
index aad78e8..ceeeb54 100644
--- a/cli/Valet/Valet.php
+++ b/cli/Valet/Valet.php
@@ -13,7 +13,6 @@ class Valet
      *
      * @param  CommandLine  $cli
      * @param  Filesystem  $files
-     * @return void
      */
     function __construct(CommandLine $cli, Filesystem $files)
     {
diff --git a/cli/drivers/StatamicV1ValetDriver.php b/cli/drivers/StatamicV1ValetDriver.php
index 1e4eab8..aba3605 100644
--- a/cli/drivers/StatamicV1ValetDriver.php
+++ b/cli/drivers/StatamicV1ValetDriver.php
@@ -8,7 +8,7 @@ class StatamicV1ValetDriver extends ValetDriver
      * @param  string  $sitePath
      * @param  string  $siteName
      * @param  string  $uri
-     * @return void
+     * @return bool
      */
     public function serves($sitePath, $siteName, $uri)
     {
diff --git a/cli/drivers/ValetDriver.php b/cli/drivers/ValetDriver.php
index 817e02d..dae57a5 100644
--- a/cli/drivers/ValetDriver.php
+++ b/cli/drivers/ValetDriver.php
@@ -63,6 +63,7 @@ public static function assign($sitePath, $siteName, $uri)
         $drivers[] = 'BasicValetDriver';
 
         foreach ($drivers as $driver) {
+            /** @var ValetDriver $driver */
             $driver = new $driver;
 
             if ($driver->serves($sitePath, $siteName, $driver->mutateUri($uri))) {
diff --git a/cli/stubs/SampleValetDriver.php b/cli/stubs/SampleValetDriver.php
index 2c21e05..f2f3a83 100644
--- a/cli/stubs/SampleValetDriver.php
+++ b/cli/stubs/SampleValetDriver.php
@@ -8,7 +8,7 @@ class SampleValetDriver extends ValetDriver
      * @param  string  $sitePath
      * @param  string  $siteName
      * @param  string  $uri
-     * @return void
+     * @return bool
      */
     public function serves($sitePath, $siteName, $uri)
     {