diff --git a/app/Http/Controllers/API/SongController.php b/app/Http/Controllers/API/SongController.php
index 0eb2b5f6..eb79fccd 100644
--- a/app/Http/Controllers/API/SongController.php
+++ b/app/Http/Controllers/API/SongController.php
@@ -41,9 +41,9 @@ class SongController extends Controller
     }
 
     /**
-     * Get extra information about a song via Last.fm
+     * Get extra information about a song via Last.fm.
      * 
-     * @param  string $id
+     * @param string $id
      *
      * @return \Illuminate\Http\JsonResponse
      */
diff --git a/app/Models/Album.php b/app/Models/Album.php
index 03f61723..61d64e67 100644
--- a/app/Models/Album.php
+++ b/app/Models/Album.php
@@ -106,7 +106,7 @@ class Album extends Model
      * Write a cover image file with binary data and update the Album with the new cover file.
      *
      * @param string $binaryData
-     * @param string $extension The file extension
+     * @param string $extension  The file extension
      */
     private function writeCoverFile($binaryData, $extension)
     {
diff --git a/database/migrations/2015_12_18_072523_add_preferences_to_users_table.php b/database/migrations/2015_12_18_072523_add_preferences_to_users_table.php
index 91225429..7c03b63b 100644
--- a/database/migrations/2015_12_18_072523_add_preferences_to_users_table.php
+++ b/database/migrations/2015_12_18_072523_add_preferences_to_users_table.php
@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
 
 class AddPreferencesToUsersTable extends Migration
 {
diff --git a/tests/LastfmTest.php b/tests/LastfmTest.php
index 4151fa58..8c536750 100644
--- a/tests/LastfmTest.php
+++ b/tests/LastfmTest.php
@@ -1,10 +1,10 @@
 <?php
 
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
+use App\Services\Lastfm;
 use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Response;
-use App\Services\Lastfm;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Foundation\Testing\WithoutMiddleware;
 
 class LastfmTest extends TestCase
 {
diff --git a/tests/RESTfulAPIServiceTest.php b/tests/RESTfulAPIServiceTest.php
index 27bb2c35..041648a2 100644
--- a/tests/RESTfulAPIServiceTest.php
+++ b/tests/RESTfulAPIServiceTest.php
@@ -1,10 +1,10 @@
 <?php
 
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Illuminate\Foundation\Testing\WithoutMiddleware;
+use App\Services\RESTfulService;
 use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Response;
-use App\Services\RESTfulService;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Illuminate\Foundation\Testing\WithoutMiddleware;
 
 class RESTfulAPIServiceTest extends TestCase
 {