diff --git a/app/Http/Controllers/API/AuthController.php b/app/Http/Controllers/API/AuthController.php
index 7fee0118..47bcae17 100644
--- a/app/Http/Controllers/API/AuthController.php
+++ b/app/Http/Controllers/API/AuthController.php
@@ -7,7 +7,6 @@ use Exception;
 use Illuminate\Http\JsonResponse;
 use JWTAuth;
 use Log;
-use Tymon\JWTAuth\Exceptions\JWTException;
 
 class AuthController extends Controller
 {
diff --git a/app/Http/Controllers/API/PlaylistController.php b/app/Http/Controllers/API/PlaylistController.php
index 2f20cf43..b0b73e8a 100644
--- a/app/Http/Controllers/API/PlaylistController.php
+++ b/app/Http/Controllers/API/PlaylistController.php
@@ -65,8 +65,9 @@ class PlaylistController extends Controller
      * @param PlaylistSyncRequest $request
      * @param Playlist            $playlist
      *
-     * @return JsonResponse
      * @throws AuthorizationException
+     *
+     * @return JsonResponse
      */
     public function sync(PlaylistSyncRequest $request, Playlist $playlist)
     {
@@ -82,8 +83,9 @@ class PlaylistController extends Controller
      *
      * @param Playlist $playlist
      *
-     * @return JsonResponse
      * @throws AuthorizationException
+     *
+     * @return JsonResponse
      */
     public function getSongs(Playlist $playlist)
     {
diff --git a/app/Http/Requests/API/SongLikeRequest.php b/app/Http/Requests/API/SongLikeRequest.php
index 4a2bfd06..f9be9c90 100644
--- a/app/Http/Requests/API/SongLikeRequest.php
+++ b/app/Http/Requests/API/SongLikeRequest.php
@@ -9,25 +9,25 @@ use App\Models\Song;
  */
 class SongLikeRequest extends Request
 {
-	/**
-	 * Determine if the user is authorized to make this request.
-	 *
-	 * @return bool
-	 */
-	public function authorize()
-	{
-		return true;
-	}
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
 
-	/**
-	 * Get the validation rules that apply to the request.
-	 *
-	 * @return array
-	 */
-	public function rules()
-	{
-		return [
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
 
-		];
-	}
+        ];
+    }
 }
diff --git a/app/Services/Download.php b/app/Services/Download.php
index 7f484ebc..9e44bc39 100644
--- a/app/Services/Download.php
+++ b/app/Services/Download.php
@@ -111,8 +111,9 @@ class Download
     /**
      * @param Playlist $playlist
      *
-     * @return string
      * @throws Exception
+     *
+     * @return string
      */
     protected function fromPlaylist(Playlist $playlist)
     {
@@ -122,8 +123,9 @@ class Download
     /**
      * @param Album $album
      *
-     * @return string
      * @throws Exception
+     *
+     * @return string
      */
     protected function fromAlbum(Album $album)
     {
@@ -133,8 +135,9 @@ class Download
     /**
      * @param Artist $artist
      *
-     * @return string
      * @throws Exception
+     *
+     * @return string
      */
     protected function fromArtist(Artist $artist)
     {
diff --git a/app/Services/Media.php b/app/Services/Media.php
index c4fdb257..3540c741 100644
--- a/app/Services/Media.php
+++ b/app/Services/Media.php
@@ -237,6 +237,7 @@ class Media
 
     /**
      * Tidy up the library by deleting empty albums and artists.
+     *
      * @throws Exception
      */
     public function tidy()
diff --git a/tests/Feature/InteractionTest.php b/tests/Feature/InteractionTest.php
index 5bc971e1..cd2cfdd3 100644
--- a/tests/Feature/InteractionTest.php
+++ b/tests/Feature/InteractionTest.php
@@ -44,6 +44,7 @@ class InteractionTest extends TestCase
 
     /**
      * @test
+     *
      * @throws \Exception
      */
     public function user_can_like_and_unlike_a_song()
@@ -73,6 +74,7 @@ class InteractionTest extends TestCase
 
     /**
      * @test
+     *
      * @throws \Exception
      */
     public function user_can_like_and_unlike_songs_in_batch()
diff --git a/tests/Feature/MediaTest.php b/tests/Feature/MediaTest.php
index ec83610b..90e2ed32 100644
--- a/tests/Feature/MediaTest.php
+++ b/tests/Feature/MediaTest.php
@@ -25,6 +25,7 @@ class MediaTest extends TestCase
 
     /**
      * @test
+     *
      * @throws \Exception
      */
     public function songs_can_be_synced()
@@ -91,6 +92,7 @@ class MediaTest extends TestCase
 
     /**
      * @test
+     *
      * @throws \Exception
      */
     public function songs_can_be_force_synced()
@@ -129,6 +131,7 @@ class MediaTest extends TestCase
 
     /**
      * @test
+     *
      * @throws \Exception
      */
     public function songs_can_be_synced_with_selectively_tags()
@@ -158,6 +161,7 @@ class MediaTest extends TestCase
 
     /**
      * @test
+     *
      * @throws \Exception
      */
     public function all_tags_are_catered_for_if_syncing_new_file()
@@ -183,6 +187,7 @@ class MediaTest extends TestCase
 
     /**
      * @test
+     *
      * @throws \Exception
      */
     public function added_song_is_synced_when_watching()
@@ -198,6 +203,7 @@ class MediaTest extends TestCase
 
     /**
      * @test
+     *
      * @throws \Exception
      */
     public function deleted_song_is_synced_when_watching()
@@ -214,6 +220,7 @@ class MediaTest extends TestCase
 
     /**
      * @test
+     *
      * @throws \Exception
      */
     public function deleted_directory_is_synced_when_watching()
@@ -256,6 +263,7 @@ class MediaTest extends TestCase
 
     /**
      * @test
+     *
      * @throws \Exception
      */
     public function hidden_files_can_optionally_be_ignored_when_syncing()
diff --git a/tests/Integration/Services/YouTubeTest.php b/tests/Integration/Services/YouTubeTest.php
index 39623169..36f058df 100644
--- a/tests/Integration/Services/YouTubeTest.php
+++ b/tests/Integration/Services/YouTubeTest.php
@@ -18,6 +18,7 @@ class YouTubeTest extends TestCase
 
     /**
      * @test
+     *
      * @throws \Exception
      */
     public function videos_can_be_searched_from_youtube()