diff --git a/app/Commands/AddTrackToPlaylistCommand.php b/app/Commands/AddTrackToPlaylistCommand.php
index 21f785cd..d2cead99 100644
--- a/app/Commands/AddTrackToPlaylistCommand.php
+++ b/app/Commands/AddTrackToPlaylistCommand.php
@@ -59,7 +59,7 @@ class AddTrackToPlaylistCommand extends CommandBase
         // check if this track is already in the playlist
         $validator = Validator::make(
             ['track_id' => $this->_track->id],
-            ['track_id' => "unique:playlist_track,track_id,null,id,playlist_id,{$this->_playlist->id}",]
+            ['track_id' => "unique:playlist_track,track_id,null,id,playlist_id,{$this->_playlist->id}", ]
         );
 
         if ($validator->fails()) {
@@ -72,7 +72,7 @@ class AddTrackToPlaylistCommand extends CommandBase
         $this->_playlist->touch();
 
         Playlist::where('id', $this->_playlist->id)->update([
-            'track_count' => DB::raw('(SELECT COUNT(id) FROM playlist_track WHERE playlist_id = ' . $this->_playlist->id . ')')
+            'track_count' => DB::raw('(SELECT COUNT(id) FROM playlist_track WHERE playlist_id = '.$this->_playlist->id.')')
         ]);
 
         return CommandResponse::succeed(['message' => 'Track added!']);
diff --git a/app/Commands/EditAlbumCommand.php b/app/Commands/EditAlbumCommand.php
index 4beeec3d..2f7fe285 100644
--- a/app/Commands/EditAlbumCommand.php
+++ b/app/Commands/EditAlbumCommand.php
@@ -90,11 +90,11 @@ class EditAlbumCommand extends CommandBase
         }
 
         if (isset($this->_input['username'])) {
-          $newid = User::where('username', $this->_input['username'])->first()->id;
+            $newid = User::where('username', $this->_input['username'])->first()->id;
 
-          if ($this->_album->user_id != $newid) {
+            if ($this->_album->user_id != $newid) {
             $this->_album->user_id = $newid;
-          }
+            }
         }
 
         $trackIds = explode(',', $this->_input['track_ids']);
diff --git a/app/Commands/EditTrackCommand.php b/app/Commands/EditTrackCommand.php
index ed4a358b..542d21da 100644
--- a/app/Commands/EditTrackCommand.php
+++ b/app/Commands/EditTrackCommand.php
@@ -27,7 +27,6 @@ use Poniverse\Ponyfm\Models\Image;
 use Poniverse\Ponyfm\Models\Track;
 use Poniverse\Ponyfm\Models\TrackType;
 use Poniverse\Ponyfm\Models\User;
-use Auth;
 use DB;
 
 class EditTrackCommand extends CommandBase
@@ -66,8 +65,8 @@ class EditTrackCommand extends CommandBase
         $rules = [
             'title' => 'required|min:3|max:80',
             'released_at' => 'before:' .
-                 (date('Y-m-d', time() + (86400 * 2))) . (
-                 isset($this->_input['released_at']) && $this->_input['released_at'] != ""
+                    (date('Y-m-d', time() + (86400 * 2))) . (
+                    isset($this->_input['released_at']) && $this->_input['released_at'] != ""
                  ? '|date'
                  : ''),
             'license_id' => 'required|exists:licenses,id',
@@ -157,12 +156,12 @@ class EditTrackCommand extends CommandBase
         $oldid = null;
 
         if (isset($this->_input['username'])) {
-          $newid = User::where('username', $this->_input['username'])->first()->id;
+            $newid = User::where('username', $this->_input['username'])->first()->id;
 
-          if ($track->user_id != $newid) {
+            if ($track->user_id != $newid) {
             $oldid = $track->user_id;
             $track->user_id = $newid;
-          }
+            }
         }
 
         $track->updateTags();
@@ -173,9 +172,9 @@ class EditTrackCommand extends CommandBase
         ]);
 
         if ($oldid != null) {
-          User::whereId($oldid)->update([
-              'track_count' => DB::raw('(SELECT COUNT(id) FROM tracks WHERE deleted_at IS NULL AND published_at IS NOT NULL AND user_id = ' . $oldid . ')')
-          ]);
+            User::whereId($oldid)->update([
+                'track_count' => DB::raw('(SELECT COUNT(id) FROM tracks WHERE deleted_at IS NULL AND published_at IS NOT NULL AND user_id = ' . $oldid . ')')
+            ]);
         }
 
         return CommandResponse::succeed(['real_cover_url' => $track->getCoverUrl(Image::NORMAL)]);
diff --git a/app/Commands/GenerateTrackFilesCommand.php b/app/Commands/GenerateTrackFilesCommand.php
index 8663cfe2..f61ea3c8 100644
--- a/app/Commands/GenerateTrackFilesCommand.php
+++ b/app/Commands/GenerateTrackFilesCommand.php
@@ -30,7 +30,6 @@ use AudioCache;
 use File;
 use Illuminate\Support\Str;
 use SplFileInfo;
-use Validator;
 
 /**
  * This command is the "second phase" of the upload process - once metadata has
diff --git a/app/Commands/ParseTrackTagsCommand.php b/app/Commands/ParseTrackTagsCommand.php
index 6fbfb1d2..e6428441 100644
--- a/app/Commands/ParseTrackTagsCommand.php
+++ b/app/Commands/ParseTrackTagsCommand.php
@@ -119,7 +119,7 @@ class ParseTrackTagsCommand extends CommandBase
      *
      * @param int $artistId
      * @param string|null $albumName
-     * @param null $coverId
+     * @param integer|null $coverId
      * @return int|null
      */
     protected function getAlbumId(int $artistId, $albumName, $coverId = null) {
@@ -236,9 +236,9 @@ class ParseTrackTagsCommand extends CommandBase
             }
 
             // write temporary image file
-            $tmpPath = Config::get('ponyfm.files_directory') . '/tmp';
+            $tmpPath = Config::get('ponyfm.files_directory').'/tmp';
 
-            $filename = $file->getFilename() . ".cover.${extension}";
+            $filename = $file->getFilename().".cover.${extension}";
             $imageFilePath = "${tmpPath}/${filename}";
 
             File::put($imageFilePath, $image['data']);
diff --git a/app/Commands/RemoveTrackFromPlaylistCommand.php b/app/Commands/RemoveTrackFromPlaylistCommand.php
index bf77af64..e80242ce 100644
--- a/app/Commands/RemoveTrackFromPlaylistCommand.php
+++ b/app/Commands/RemoveTrackFromPlaylistCommand.php
@@ -54,7 +54,7 @@ class RemoveTrackFromPlaylistCommand extends CommandBase
     {
         $this->_playlist->tracks()->detach($this->_track);
         Playlist::whereId($this->_playlist->id)->update([
-            'track_count' => DB::raw('(SELECT COUNT(id) FROM playlist_track WHERE playlist_id = ' . $this->_playlist->id . ')')
+            'track_count' => DB::raw('(SELECT COUNT(id) FROM playlist_track WHERE playlist_id = '.$this->_playlist->id.')')
         ]);
 
         return CommandResponse::succeed(['message' => 'Track removed!']);
diff --git a/app/Commands/ToggleFavouriteCommand.php b/app/Commands/ToggleFavouriteCommand.php
index a336e885..b97d9981 100644
--- a/app/Commands/ToggleFavouriteCommand.php
+++ b/app/Commands/ToggleFavouriteCommand.php
@@ -70,7 +70,7 @@ class ToggleFavouriteCommand extends CommandBase
      */
     public function execute()
     {
-        $typeId = $this->_resourceType . '_id';
+        $typeId = $this->_resourceType.'_id';
         $existing = Favourite::where($typeId, '=', $this->_resourceId)->whereUserId(Auth::user()->id)->first();
         $isFavourited = false;
 
@@ -91,7 +91,7 @@ class ToggleFavouriteCommand extends CommandBase
         $resourceUser->is_favourited = $isFavourited;
         $resourceUser->save();
 
-        $resourceTable = $this->_resourceType . 's';
+        $resourceTable = $this->_resourceType.'s';
 
         // We do this to prevent a race condition. Sure I could simply increment the count columns and re-save back to the db
         // but that would require an additional SELECT and the operation would be non-atomic. If two log items are created
@@ -105,7 +105,7 @@ class ToggleFavouriteCommand extends CommandBase
                     FROM
                         favourites
                     WHERE ' .
-                    $typeId . ' = ' . $this->_resourceId . ')')
+                    $typeId.' = '.$this->_resourceId.')')
         ]);
 
         return CommandResponse::succeed(['is_favourited' => $isFavourited]);
diff --git a/app/Commands/UploadTrackCommand.php b/app/Commands/UploadTrackCommand.php
index 4cbcae3a..f50129a4 100644
--- a/app/Commands/UploadTrackCommand.php
+++ b/app/Commands/UploadTrackCommand.php
@@ -86,12 +86,12 @@ class UploadTrackCommand extends CommandBase
         $track->save();
         $track->ensureDirectoryExists();
 
-        if (!is_dir(Config::get('ponyfm.files_directory') . '/tmp')) {
-            mkdir(Config::get('ponyfm.files_directory') . '/tmp', 0755, true);
+        if (!is_dir(Config::get('ponyfm.files_directory').'/tmp')) {
+            mkdir(Config::get('ponyfm.files_directory').'/tmp', 0755, true);
         }
 
-        if (!is_dir(Config::get('ponyfm.files_directory') . '/queued-tracks')) {
-            mkdir(Config::get('ponyfm.files_directory') . '/queued-tracks', 0755, true);
+        if (!is_dir(Config::get('ponyfm.files_directory').'/queued-tracks')) {
+            mkdir(Config::get('ponyfm.files_directory').'/queued-tracks', 0755, true);
         }
         $trackFile = $trackFile->move(Config::get('ponyfm.files_directory').'/queued-tracks', $track->id);
 
diff --git a/app/Console/Commands/ClassifyMLPMA.php b/app/Console/Commands/ClassifyMLPMA.php
index 926c2988..03d453d2 100644
--- a/app/Console/Commands/ClassifyMLPMA.php
+++ b/app/Console/Commands/ClassifyMLPMA.php
@@ -76,15 +76,15 @@ class ClassifyMLPMA extends Command
 
         $totalTracks = sizeof($tracks);
 
-        $fileToStartAt = (int)$this->option('startAt') - 1;
-        $this->comment("Skipping $fileToStartAt files..." . PHP_EOL);
+        $fileToStartAt = (int) $this->option('startAt') - 1;
+        $this->comment("Skipping $fileToStartAt files...".PHP_EOL);
 
         $tracks = array_slice($tracks, $fileToStartAt);
         $this->currentTrack = $fileToStartAt;
 
         foreach ($tracks as $track) {
             $this->currentTrack++;
-            $this->comment('[' . $this->currentTrack . '/' . $totalTracks . '] Classifying track [' . $track->filename . ']...');
+            $this->comment('['.$this->currentTrack.'/'.$totalTracks.'] Classifying track ['.$track->filename.']...');
 
             $parsedTags = json_decode($track->parsed_tags, true);
 
@@ -163,7 +163,7 @@ class ClassifyMLPMA extends Command
 
 
         foreach ($officialSongs as $song) {
-            $this->comment('=> Matched official song: [' . $song->id . '] ' . $song->title);
+            $this->comment('=> Matched official song: ['.$song->id.'] '.$song->title);
         }
 
 
@@ -186,11 +186,11 @@ class ClassifyMLPMA extends Command
             }
             $this->question('If this is a medley, multiple song ID\'s can be separated by commas. ');
             $this->question('                                                                    ');
-            $this->question('  ' . $filename . '    ');
+            $this->question('  '.$filename.'    ');
             $this->question('                                                                    ');
-            $this->question('    Title:  ' . $tags['title'] . '    ');
-            $this->question('    Album:  ' . $tags['album'] . '    ');
-            $this->question('    Artist: ' . $tags['artist'] . '    ');
+            $this->question('    Title:  '.$tags['title'].'    ');
+            $this->question('    Album:  '.$tags['album'].'    ');
+            $this->question('    Artist: '.$tags['artist'].'    ');
             $this->question('                                                                    ');
             $this->question('    r = official song remix (accept all "guessed" matches)          ');
             $this->question('    # = official song remix (enter the ID(s) of the show song(s))   ');
@@ -205,7 +205,7 @@ class ClassifyMLPMA extends Command
                 case 'r':
                     $trackTypeId = TrackType::OFFICIAL_TRACK_REMIX;
                     foreach ($officialSongs as $officialSong) {
-                        $linkedSongIds[] = (int)$officialSong->id;
+                        $linkedSongIds[] = (int) $officialSong->id;
                     }
                     break;
 
@@ -228,8 +228,8 @@ class ClassifyMLPMA extends Command
                 default:
                     $trackTypeId = TrackType::OFFICIAL_TRACK_REMIX;
                     $linkedSongIds = explode(',', $input);
-                    $linkedSongIds = array_map(function ($item) {
-                        return (int)$item;
+                    $linkedSongIds = array_map(function($item) {
+                        return (int) $item;
                     }, $linkedSongIds);
             }
         }
diff --git a/app/Console/Commands/FixMLPMAImages.php b/app/Console/Commands/FixMLPMAImages.php
index 0144786f..b21bf5be 100644
--- a/app/Console/Commands/FixMLPMAImages.php
+++ b/app/Console/Commands/FixMLPMAImages.php
@@ -79,35 +79,35 @@ class FixMLPMAImages extends Command
      */
     public function handle()
     {
-        $mlpmaPath = Config::get('ponyfm.files_directory') . '/mlpma';
-        $tmpPath = Config::get('ponyfm.files_directory') . '/tmp';
+        $mlpmaPath = Config::get('ponyfm.files_directory').'/mlpma';
+        $tmpPath = Config::get('ponyfm.files_directory').'/tmp';
 
         $this->comment('Enumerating MLP Music Archive source files...');
         $files = File::allFiles($mlpmaPath);
-        $this->info(sizeof($files) . ' files found!');
+        $this->info(sizeof($files).' files found!');
 
         $this->comment('Importing tracks...');
         $totalFiles = sizeof($files);
         $fileToStartAt = (int) $this->option('startAt') - 1;
 
-        $this->comment("Skipping $fileToStartAt files..." . PHP_EOL);
+        $this->comment("Skipping $fileToStartAt files...".PHP_EOL);
         $files = array_slice($files, $fileToStartAt);
         $this->currentFile = $fileToStartAt;
 
 
         foreach ($files as $file) {
-            $this->currentFile ++;
+            $this->currentFile++;
 
-            $this->info('[' . $this->currentFile . '/' . $totalFiles . '] Importing track [' . $file->getFilename() . ']...');
+            $this->info('['.$this->currentFile.'/'.$totalFiles.'] Importing track ['.$file->getFilename().']...');
             if (in_array($file->getExtension(), $this->ignoredExtensions)) {
-                $this->comment('This is not an audio file! Skipping...' . PHP_EOL);
+                $this->comment('This is not an audio file! Skipping...'.PHP_EOL);
                 continue;
             }
             // Get this track's MLPMA record
             $importedTrack = DB::table('mlpma_tracks')
-                               ->where('filename', '=', $file->getFilename())
-                               ->join('tracks', 'mlpma_tracks.track_id', '=', 'tracks.id')
-                               ->first();
+                                ->where('filename', '=', $file->getFilename())
+                                ->join('tracks', 'mlpma_tracks.track_id', '=', 'tracks.id')
+                                ->first();
             $artistId = $importedTrack->user_id;
 
 
@@ -138,8 +138,8 @@ class FixMLPMAImages extends Command
                     $this->error('Unknown cover art format!');
                 }
                 // write temporary image file
-                $imageFilename = $file->getFilename() . ".cover.$extension";
-                $imageFilePath = "$tmpPath/" . $imageFilename;
+                $imageFilename = $file->getFilename().".cover.$extension";
+                $imageFilePath = "$tmpPath/".$imageFilename;
                 File::put($imageFilePath, $image['data']);
                 $imageFile = new UploadedFile($imageFilePath, $imageFilename, $image['image_mime']);
                 $cover = Image::upload($imageFile, $artistId, true);
diff --git a/app/Console/Commands/MigrateOldData.php b/app/Console/Commands/MigrateOldData.php
index 166be24c..c0830d1e 100644
--- a/app/Console/Commands/MigrateOldData.php
+++ b/app/Console/Commands/MigrateOldData.php
@@ -100,12 +100,12 @@ class MigrateOldData extends Command
             $coverId = null;
             if (!$user->uses_gravatar) {
                 try {
-                    $coverFile = $this->getIdDirectory('users', $user->id) . '/' . $user->id . '_.png';
+                    $coverFile = $this->getIdDirectory('users', $user->id).'/'.$user->id.'_.png';
                     $coverId = Image::upload(new UploadedFile($coverFile,
-                        $user->id . '_.png'), $user->id)->id;
+                        $user->id.'_.png'), $user->id)->id;
                     DB::table('users')->where('id', $user->id)->update(['avatar_id' => $coverId]);
                 } catch (\Exception $e) {
-                    $this->error('Could copy user avatar ' . $user->id . ' because ' . $e->getMessage());
+                    $this->error('Could copy user avatar '.$user->id.' because '.$e->getMessage());
                     DB::table('users')->where('id', $user->id)->update(['uses_gravatar' => true]);
                 }
             }
@@ -150,7 +150,7 @@ class MigrateOldData extends Command
                         'ip_address' => $logItem->ip_address,
                     ]);
                 } catch (\Exception $e) {
-                    $this->error('Could insert log item for album ' . $playlist->id . ' because ' . $e->getMessage());
+                    $this->error('Could insert log item for album '.$playlist->id.' because '.$e->getMessage());
                 }
             }
 
@@ -165,7 +165,7 @@ class MigrateOldData extends Command
                         'track_format_id' => $logItem->track_file_format_id - 1
                     ]);
                 } catch (\Exception $e) {
-                    $this->error('Could insert log item for album ' . $playlist->id . ' because ' . $e->getMessage());
+                    $this->error('Could insert log item for album '.$playlist->id.' because '.$e->getMessage());
                 }
             }
         }
@@ -177,11 +177,11 @@ class MigrateOldData extends Command
             if ($track->cover) {
                 try {
                     $coverFile = $this->getIdDirectory('tracks',
-                            $track->id) . '/' . $track->id . '_' . $track->cover . '.png';
+                            $track->id).'/'.$track->id.'_'.$track->cover.'.png';
                     $coverId = Image::upload(new UploadedFile($coverFile,
-                        $track->id . '_' . $track->cover . '.png'), $track->user_id)->id;
+                        $track->id.'_'.$track->cover.'.png'), $track->user_id)->id;
                 } catch (\Exception $e) {
-                    $this->error('Could copy track cover ' . $track->id . ' because ' . $e->getMessage());
+                    $this->error('Could copy track cover '.$track->id.' because '.$e->getMessage());
                 }
             }
 
@@ -226,7 +226,7 @@ class MigrateOldData extends Command
                         'ip_address' => $logItem->ip_address
                     ]);
                 } catch (\Exception $e) {
-                    $this->error('Could insert log item for track ' . $track->id . ' because ' . $e->getMessage());
+                    $this->error('Could insert log item for track '.$track->id.' because '.$e->getMessage());
                 }
             }
 
@@ -240,7 +240,7 @@ class MigrateOldData extends Command
                         'ip_address' => $logItem->ip_address
                     ]);
                 } catch (\Exception $e) {
-                    $this->error('Could insert log item for track ' . $track->id . ' because ' . $e->getMessage());
+                    $this->error('Could insert log item for track '.$track->id.' because '.$e->getMessage());
                 }
             }
 
@@ -255,7 +255,7 @@ class MigrateOldData extends Command
                         'track_format_id' => $logItem->track_file_format_id - 1
                     ]);
                 } catch (\Exception $e) {
-                    $this->error('Could insert log item for track ' . $track->id . ' because ' . $e->getMessage());
+                    $this->error('Could insert log item for track '.$track->id.' because '.$e->getMessage());
                 }
             }
         }
@@ -269,7 +269,7 @@ class MigrateOldData extends Command
                     'track_id' => $song->track_id
                 ]);
             } catch (\Exception $e) {
-                $this->error('Could insert show track item for ' . $song->track_id . ' because ' . $e->getMessage());
+                $this->error('Could insert show track item for '.$song->track_id.' because '.$e->getMessage());
             }
         }
 
@@ -303,7 +303,7 @@ class MigrateOldData extends Command
                         'ip_address' => $logItem->ip_address,
                     ]);
                 } catch (\Exception $e) {
-                    $this->error('Could insert log item for playlist ' . $playlist->id . ' because ' . $e->getMessage());
+                    $this->error('Could insert log item for playlist '.$playlist->id.' because '.$e->getMessage());
                 }
             }
 
@@ -318,7 +318,7 @@ class MigrateOldData extends Command
                         'track_format_id' => $logItem->track_file_format_id - 1
                     ]);
                 } catch (\Exception $e) {
-                    $this->error('Could insert log item for playlist ' . $playlist->id . ' because ' . $e->getMessage());
+                    $this->error('Could insert log item for playlist '.$playlist->id.' because '.$e->getMessage());
                 }
             }
         }
@@ -353,7 +353,7 @@ class MigrateOldData extends Command
                     'profile_id' => $comment->profile_id
                 ]);
             } catch (Exception $e) {
-                $this->error('Could not sync comment ' . $comment->id . ' because ' . $e->getMessage());
+                $this->error('Could not sync comment '.$comment->id.' because '.$e->getMessage());
             }
         }
 
@@ -370,7 +370,7 @@ class MigrateOldData extends Command
                     'playlist_id' => $fav->playlist_id,
                 ]);
             } catch (Exception $e) {
-                $this->error('Could not sync favourite ' . $fav->id . ' because ' . $e->getMessage());
+                $this->error('Could not sync favourite '.$fav->id.' because '.$e->getMessage());
             }
         }
 
@@ -385,16 +385,16 @@ class MigrateOldData extends Command
                     'created_at' => $follower->created_at,
                 ]);
             } catch (Exception $e) {
-                $this->error('Could not sync follower ' . $follower->id . ' because ' . $e->getMessage());
+                $this->error('Could not sync follower '.$follower->id.' because '.$e->getMessage());
             }
         }
     }
 
     private function getIdDirectory($type, $id)
     {
-        $dir = (string)(floor($id / 100) * 100);
+        $dir = (string) (floor($id / 100) * 100);
 
-        return \Config::get('ponyfm.files_directory') . '/' . $type . '/' . $dir;
+        return \Config::get('ponyfm.files_directory').'/'.$type.'/'.$dir;
     }
 
 }
diff --git a/app/Console/Commands/PoniverseApiSetup.php b/app/Console/Commands/PoniverseApiSetup.php
index 8c284bb8..4144ca5f 100644
--- a/app/Console/Commands/PoniverseApiSetup.php
+++ b/app/Console/Commands/PoniverseApiSetup.php
@@ -109,7 +109,7 @@ class PoniverseApiSetup extends Command
 
         if (file_exists($path)) {
             file_put_contents($path, str_replace(
-                "$key=" . $oldValue, "$key=" . $newValue, file_get_contents($path)
+                "$key=".$oldValue, "$key=".$newValue, file_get_contents($path)
             ));
         } else {
             $this->error('Please run `vagrant up`!');
diff --git a/app/Console/Commands/RebuildFilesizes.php b/app/Console/Commands/RebuildFilesizes.php
index e3236b9a..bd793d7a 100644
--- a/app/Console/Commands/RebuildFilesizes.php
+++ b/app/Console/Commands/RebuildFilesizes.php
@@ -63,7 +63,7 @@ class RebuildFilesizes extends Command
                 false)
         ) {
 
-            TrackFile::chunk(200, function ($trackFiles) {
+            TrackFile::chunk(200, function($trackFiles) {
 
                 $this->info('========== Start Chunk ==========');
 
@@ -72,9 +72,9 @@ class RebuildFilesizes extends Command
 
                     if (File::exists($trackFile->getFile())) {
                         $size = $trackFile->updateFilesize();
-                        $this->info('ID ' . $trackFile->id . ' processed - ' . $size . ' bytes');
+                        $this->info('ID '.$trackFile->id.' processed - '.$size.' bytes');
                     } else {
-                        $this->info('ID ' . $trackFile->id . ' skipped');
+                        $this->info('ID '.$trackFile->id.' skipped');
                     }
                 }
 
diff --git a/app/Console/Commands/RebuildSearchIndex.php b/app/Console/Commands/RebuildSearchIndex.php
index 4f3abca3..6e34fd4d 100644
--- a/app/Console/Commands/RebuildSearchIndex.php
+++ b/app/Console/Commands/RebuildSearchIndex.php
@@ -26,7 +26,6 @@ use Poniverse\Ponyfm\Models\Album;
 use Poniverse\Ponyfm\Models\Playlist;
 use Poniverse\Ponyfm\Models\Track;
 use Poniverse\Ponyfm\Models\User;
-use Symfony\Component\Console\Helper\ProgressBar;
 
 class RebuildSearchIndex extends Command
 {
@@ -68,7 +67,7 @@ class RebuildSearchIndex extends Command
         $trackProgress = $this->output->createProgressBar($totalTracks);
         $this->info("Processing tracks...");
         Track::withTrashed()->chunk(200, function(Collection $tracks) use ($trackProgress) {
-            foreach($tracks as $track) {
+            foreach ($tracks as $track) {
                 /** @var Track $track */
                 $trackProgress->advance();
                 $track->updateElasticsearchEntry();
@@ -81,7 +80,7 @@ class RebuildSearchIndex extends Command
         $albumProgress = $this->output->createProgressBar($totalAlbums);
         $this->info("Processing albums...");
         Album::withTrashed()->chunk(200, function(Collection $albums) use ($albumProgress) {
-            foreach($albums as $album) {
+            foreach ($albums as $album) {
                 /** @var Album $album */
                 $albumProgress->advance();
                 $album->updateElasticsearchEntry();
@@ -94,7 +93,7 @@ class RebuildSearchIndex extends Command
         $playlistProgress = $this->output->createProgressBar($totalPlaylists);
         $this->info("Processing playlists...");
         Playlist::withTrashed()->chunk(200, function(Collection $playlists) use ($playlistProgress) {
-            foreach($playlists as $playlist) {
+            foreach ($playlists as $playlist) {
                 /** @var Playlist $playlist */
                 $playlistProgress->advance();
                 $playlist->updateElasticsearchEntry();
@@ -107,7 +106,7 @@ class RebuildSearchIndex extends Command
         $userProgress = $this->output->createProgressBar($totalUsers);
         $this->info("Processing users...");
         User::chunk(200, function(Collection $users) use ($userProgress) {
-            foreach($users as $user) {
+            foreach ($users as $user) {
                 /** @var User $user */
                 $userProgress->advance();
                 $user->updateElasticsearchEntry();
diff --git a/app/Console/Commands/RebuildTrackCache.php b/app/Console/Commands/RebuildTrackCache.php
index 67e4727d..de8fd4c1 100644
--- a/app/Console/Commands/RebuildTrackCache.php
+++ b/app/Console/Commands/RebuildTrackCache.php
@@ -83,7 +83,7 @@ class RebuildTrackCache extends Command
             // Chunk track files which are cacheable and NOT master
             TrackFile::where('is_cacheable', true)
                 ->where('is_master', false)
-                ->chunk(200, function ($trackFiles) use (&$count) {
+                ->chunk(200, function($trackFiles) use (&$count) {
                     // Delete chunked track files
                     foreach ($trackFiles as $trackFile) {
                         // Clear expiration so will be re-cached on next request
@@ -94,11 +94,11 @@ class RebuildTrackCache extends Command
                         if (File::exists($trackFile->getFile())) {
                             $count++;
                             File::delete($trackFile->getFile());
-                            $this->info('Deleted ' . $trackFile->getFile());
+                            $this->info('Deleted '.$trackFile->getFile());
                         }
                     }
 
-                    $this->info($count . ' track files deleted. Deletion complete. Continuing.');
+                    $this->info($count.' track files deleted. Deletion complete. Continuing.');
                 });
 
             //==========================================================================================================
@@ -115,7 +115,7 @@ class RebuildTrackCache extends Command
             TrackFile::where('is_cacheable', false)
                 ->whereIn('format', Track::$CacheableFormats)
                 ->where('is_master', false)
-                ->chunk(200, function ($trackFiles) use (&$trackFileCount, &$formats) {
+                ->chunk(200, function($trackFiles) use (&$trackFileCount, &$formats) {
                     $this->output->newLine(1);
                     $this->info('---------- Start Chunk ----------');
 
@@ -135,8 +135,8 @@ class RebuildTrackCache extends Command
                     $this->output->newLine(1);
                 });
 
-            $this->info('Format(s) set from non-cacheable to cacheable: ' . implode(' ', array_unique($formats)));
-            $this->info($trackFileCount . ' non-cacheable track files set to cacheable.');
+            $this->info('Format(s) set from non-cacheable to cacheable: '.implode(' ', array_unique($formats)));
+            $this->info($trackFileCount.' non-cacheable track files set to cacheable.');
 
             $this->output->newLine(2);
 
@@ -150,7 +150,7 @@ class RebuildTrackCache extends Command
             // Chunk track files which are NOT meant to be cacheable, but currently cacheable
             TrackFile::where('is_cacheable', true)
                 ->whereNotIn('format', Track::$CacheableFormats)
-                ->chunk(200, function ($trackFiles) use (&$trackFileCount, &$formats) {
+                ->chunk(200, function($trackFiles) use (&$trackFileCount, &$formats) {
                     $this->output->newLine(1);
                     $this->info('---------- Start Chunk ----------');
 
@@ -172,8 +172,8 @@ class RebuildTrackCache extends Command
                 });
 
 
-            $this->info('Format(s) set from cacheable to non-cacheable: ' . implode(' ', array_unique($formats)));
-            $this->info($trackFileCount . ' cacheable track files set to non-cacheable.');
+            $this->info('Format(s) set from cacheable to non-cacheable: '.implode(' ', array_unique($formats)));
+            $this->info($trackFileCount.' cacheable track files set to non-cacheable.');
 
             //==========================================================================================================
             // Delete track files which have now been marked as cacheable
@@ -188,7 +188,7 @@ class RebuildTrackCache extends Command
             // Find track files which are cacheable and NOT master
             TrackFile::whereIn('format', Track::$CacheableFormats)
                 ->where('is_master', false)
-                ->chunk(200, function ($trackFiles) use (&$count, &$trackFileCount) {
+                ->chunk(200, function($trackFiles) use (&$count, &$trackFileCount) {
                     $this->output->newLine(1);
                     $this->info('---------- Start Chunk ----------');
 
@@ -200,7 +200,7 @@ class RebuildTrackCache extends Command
                             $count++;
 
                             File::delete($trackFile->getFile());
-                            $this->info('Deleted ' . $trackFile->getFile());
+                            $this->info('Deleted '.$trackFile->getFile());
                         }
                     }
 
@@ -223,7 +223,7 @@ class RebuildTrackCache extends Command
             // Chunk non-cacheable track files
             TrackFile::where('is_cacheable', false)
                 ->where('is_master', false)
-                ->chunk(200, function ($trackFiles) use (&$count) {
+                ->chunk(200, function($trackFiles) use (&$count) {
                 $this->output->newLine(1);
                 $this->info('---------- Start Chunk ----------');
 
@@ -248,7 +248,7 @@ class RebuildTrackCache extends Command
             });
 
 
-            $this->info($count . ' track files encoded.');
+            $this->info($count.' track files encoded.');
             $this->output->newLine(1);
 
             $this->info('Rebuild complete. Exiting.');
diff --git a/app/Console/Commands/RefreshCache.php b/app/Console/Commands/RefreshCache.php
index 19b985f6..b1eee3da 100644
--- a/app/Console/Commands/RefreshCache.php
+++ b/app/Console/Commands/RefreshCache.php
@@ -190,7 +190,7 @@ class RefreshCache extends Command
 
         foreach ($resources as $name => $resourceArray) {
             foreach ($resourceArray as $id => $resource) {
-                DB::table($name . 's')->whereId($id)->update($resource);
+                DB::table($name.'s')->whereId($id)->update($resource);
             }
         }
 
@@ -238,7 +238,7 @@ class RefreshCache extends Command
                 'user_id' => $userId
             ];
 
-            $item[$type . '_id'] = $id;
+            $item[$type.'_id'] = $id;
 
             $items[$userId][$type][$id] = $item;
 
diff --git a/app/Http/Controllers/Api/Web/AlbumsController.php b/app/Http/Controllers/Api/Web/AlbumsController.php
index 0442b850..4d3533a2 100644
--- a/app/Http/Controllers/Api/Web/AlbumsController.php
+++ b/app/Http/Controllers/Api/Web/AlbumsController.php
@@ -55,7 +55,7 @@ class AlbumsController extends ApiControllerBase
     public function getShow($id)
     {
         $album = Album::with([
-            'tracks' => function ($query) {
+            'tracks' => function($query) {
                 $query->userDetails();
             },
             'tracks.cover',
@@ -176,7 +176,7 @@ class AlbumsController extends ApiControllerBase
     {
         $album = Album::with('tracks')->find($id);
         if (!$album) {
-            return $this->notFound('Album ' . $id . ' not found!');
+            return $this->notFound('Album '.$id.' not found!');
         }
 
         if (Gate::denies('edit', Auth::user())) {
diff --git a/app/Http/Controllers/Api/Web/ArtistsController.php b/app/Http/Controllers/Api/Web/ArtistsController.php
index a45cbe92..2a9f2893 100644
--- a/app/Http/Controllers/Api/Web/ArtistsController.php
+++ b/app/Http/Controllers/Api/Web/ArtistsController.php
@@ -166,7 +166,7 @@ class ArtistsController extends ApiControllerBase
         if ($user->users->count()) {
             $userRow = $user->users[0];
             $userData = [
-                'is_following' => (bool)$userRow->is_followed
+                'is_following' => (bool) $userRow->is_followed
             ];
         }
 
@@ -178,7 +178,7 @@ class ArtistsController extends ApiControllerBase
                 'id' => $user->id,
                 'name' => $user->display_name,
                 'slug' => $user->slug,
-                'is_archived' => (bool)$user->is_archived,
+                'is_archived' => (bool) $user->is_archived,
                 'avatars' => [
                     'small' => $user->getAvatarUrl(Image::SMALL),
                     'normal' => $user->getAvatarUrl(Image::NORMAL)
diff --git a/app/Http/Controllers/Api/Web/FavouritesController.php b/app/Http/Controllers/Api/Web/FavouritesController.php
index e1eb59f0..db445e34 100644
--- a/app/Http/Controllers/Api/Web/FavouritesController.php
+++ b/app/Http/Controllers/Api/Web/FavouritesController.php
@@ -43,7 +43,7 @@ class FavouritesController extends ApiControllerBase
             ::whereUserId(Auth::user()->id)
             ->whereNotNull('track_id')
             ->with([
-                'track' => function ($query) {
+                'track' => function($query) {
                     $query
                         ->userDetails()
                         ->published();
@@ -75,7 +75,7 @@ class FavouritesController extends ApiControllerBase
             ::whereUserId(Auth::user()->id)
             ->whereNotNull('album_id')
             ->with([
-                'album' => function ($query) {
+                'album' => function($query) {
                     $query->userDetails();
                 },
                 'album.user',
@@ -103,7 +103,7 @@ class FavouritesController extends ApiControllerBase
             ::whereUserId(Auth::user()->id)
             ->whereNotNull('playlist_id')
             ->with([
-                'playlist' => function ($query) {
+                'playlist' => function($query) {
                     $query->userDetails();
                 },
                 'playlist.user',
diff --git a/app/Http/Controllers/Api/Web/PlaylistsController.php b/app/Http/Controllers/Api/Web/PlaylistsController.php
index d10c77c4..354a4cd7 100644
--- a/app/Http/Controllers/Api/Web/PlaylistsController.php
+++ b/app/Http/Controllers/Api/Web/PlaylistsController.php
@@ -106,7 +106,7 @@ class PlaylistsController extends ApiControllerBase
             'tracks.genre',
             'tracks.cover',
             'tracks.album',
-            'tracks' => function ($query) {
+            'tracks' => function($query) {
                 $query->userDetails();
             },
             'tracks.trackFiles',
@@ -161,7 +161,7 @@ class PlaylistsController extends ApiControllerBase
         $query = Playlist
             ::userDetails()
             ->with('tracks', 'tracks.cover', 'tracks.user', 'user')
-            ->join('pinned_playlists', function ($join) {
+            ->join('pinned_playlists', function($join) {
                 $join->on('playlist_id', '=', 'playlists.id');
             })
             ->where('pinned_playlists.user_id', '=', Auth::user()->id)
diff --git a/app/Http/Controllers/Api/Web/StatsController.php b/app/Http/Controllers/Api/Web/StatsController.php
index fc37a38c..c9672713 100644
--- a/app/Http/Controllers/Api/Web/StatsController.php
+++ b/app/Http/Controllers/Api/Web/StatsController.php
@@ -43,7 +43,7 @@ class StatsController extends ApiControllerBase
             ->selectRaw('created_at, COUNT(1) AS `plays`')
             ->where('track_id', '=', $id)
             ->where('log_type', '=', ResourceLogItem::PLAY)
-            ->whereRaw('`created_at` > now() - INTERVAL ' . $playRange)
+            ->whereRaw('`created_at` > now() - INTERVAL '.$playRange)
             ->groupBy('created_at')
             ->orderBy('created_at')
             ->get();
@@ -62,7 +62,7 @@ class StatsController extends ApiControllerBase
             $playsArray = array_fill(0, 30, 0);
         }
 
-        foreach($query as $item) {
+        foreach ($query as $item) {
             $playDate = new Carbon($item->created_at);
 
             $key = 0;
@@ -82,15 +82,15 @@ class StatsController extends ApiControllerBase
         krsort($playsArray);
 
         // Covert playsArray into output we can understand
-        foreach($playsArray as $timeOffet => $plays) {
+        foreach ($playsArray as $timeOffet => $plays) {
             if ($hourly) {
                 $set = [
-                    'hours' => $timeOffet . ' ' . str_plural('hour', $timeOffet),
+                    'hours' => $timeOffet.' '.str_plural('hour', $timeOffet),
                     'plays' => $plays
                 ];
             } else {
                 $set = [
-                    'days' => $timeOffet . ' ' . str_plural('day', $timeOffet),
+                    'days' => $timeOffet.' '.str_plural('day', $timeOffet),
                     'plays' => $plays
                 ];
             }
diff --git a/app/Http/Controllers/Api/Web/TracksController.php b/app/Http/Controllers/Api/Web/TracksController.php
index 19c6b205..f78b52e2 100644
--- a/app/Http/Controllers/Api/Web/TracksController.php
+++ b/app/Http/Controllers/Api/Web/TracksController.php
@@ -48,7 +48,7 @@ class TracksController extends ApiControllerBase
         $track = Track::findOrFail($trackId);
         $this->authorize('edit', $track);
 
-        if ($track->status === Track::STATUS_PROCESSING){
+        if ($track->status === Track::STATUS_PROCESSING) {
             return Response::json(['message' => 'Processing...'], 202);
 
         } elseif ($track->status === Track::STATUS_COMPLETE) {
@@ -99,11 +99,13 @@ class TracksController extends ApiControllerBase
             return $this->notFound('Track not found!');
         }
 
-        if (!$track->canView(Auth::user()))
-            return $this->notFound('Track not found!');
+        if (!$track->canView(Auth::user())) {
+                    return $this->notFound('Track not found!');
+        }
 
-        if ($track->is_downloadable == false)
-            return $this->notFound('Track not found!');
+        if ($track->is_downloadable == false) {
+                    return $this->notFound('Track not found!');
+        }
 
         if (!in_array($format, Track::$CacheableFormats)) {
             return $this->notFound('Format not found!');
@@ -194,7 +196,7 @@ class TracksController extends ApiControllerBase
     {
         $track = Track::with('showSongs')->find($id);
         if (!$track) {
-            return $this->notFound('Track ' . $id . ' not found!');
+            return $this->notFound('Track '.$id.' not found!');
         }
 
         $this->authorize('edit', $track);
diff --git a/app/Http/Controllers/ImagesController.php b/app/Http/Controllers/ImagesController.php
index 7801c878..f0cd9920 100644
--- a/app/Http/Controllers/ImagesController.php
+++ b/app/Http/Controllers/ImagesController.php
@@ -45,7 +45,7 @@ class ImagesController extends Controller
         $filename = $image->getFile($coverType['id']);
 
         if (!is_file($filename)) {
-            $redirect = url('/images/icons/profile_' . Image::$ImageTypes[$coverType['id']]['name'] . '.png');
+            $redirect = url('/images/icons/profile_'.Image::$ImageTypes[$coverType['id']]['name'].'.png');
 
             return Redirect::to($redirect);
         }
@@ -62,7 +62,7 @@ class ImagesController extends Controller
         $lastModified = filemtime($filename);
 
         $response->header('Last-Modified', $lastModified);
-        $response->header('Cache-Control', 'max-age=' . (60 * 60 * 24 * 7));
+        $response->header('Cache-Control', 'max-age='.(60 * 60 * 24 * 7));
 
         return $response;
     }
diff --git a/app/Http/Controllers/TracksController.php b/app/Http/Controllers/TracksController.php
index 866478a7..079e12cc 100644
--- a/app/Http/Controllers/TracksController.php
+++ b/app/Http/Controllers/TracksController.php
@@ -154,11 +154,11 @@ class TracksController extends Controller
         if (Config::get('app.sendfile')) {
             $response->header('X-Sendfile', $filename);
             $response->header('Content-Disposition',
-                'attachment; filename="' . $trackFile->getDownloadFilename() . '"');
+                'attachment; filename="'.$trackFile->getDownloadFilename().'"');
         } else {
             $response->header('X-Accel-Redirect', $filename);
             $response->header('Content-Disposition',
-                'attachment; filename="' . $trackFile->getDownloadFilename() . '"');
+                'attachment; filename="'.$trackFile->getDownloadFilename().'"');
         }
 
         $time = gmdate(filemtime($filename));
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 9bc966c8..96b68f56 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -63,7 +63,7 @@ Route::get('i{id}/{type}.{extension}', 'ImagesController@getImage')->where('id',
 
 Route::get('playlist/{id}-{slug}', 'PlaylistsController@getPlaylist');
 Route::get('p{id}', 'PlaylistsController@getShortlink')->where('id', '\d+');
-Route::get('p{id}/dl.{extension}', 'PlaylistsController@getDownload' );
+Route::get('p{id}/dl.{extension}', 'PlaylistsController@getDownload');
 
 Route::get('notifications', 'AccountController@getNotifications');
 
diff --git a/app/Jobs/DeleteGenre.php b/app/Jobs/DeleteGenre.php
index 4c633ec2..94a21ab2 100644
--- a/app/Jobs/DeleteGenre.php
+++ b/app/Jobs/DeleteGenre.php
@@ -68,7 +68,7 @@ class DeleteGenre extends Job implements SelfHandling, ShouldQueue
 
         // This is done instead of a single UPDATE query in order to
         // generate revision logs for the change.
-        $this->genreToDelete->tracks()->chunk(200, function ($tracks) {
+        $this->genreToDelete->tracks()->chunk(200, function($tracks) {
             foreach ($tracks as $track) {
                 /** @var Track $track */
 
diff --git a/app/Jobs/DeleteShowSong.php b/app/Jobs/DeleteShowSong.php
index 64635c65..970a9657 100644
--- a/app/Jobs/DeleteShowSong.php
+++ b/app/Jobs/DeleteShowSong.php
@@ -64,7 +64,7 @@ class DeleteShowSong extends Job implements SelfHandling, ShouldQueue
 
         // This is done instead of a single UPDATE query in order to
         // generate revision logs for the change.
-        $this->songToDelete->tracks()->chunk(200, function ($tracks) {
+        $this->songToDelete->tracks()->chunk(200, function($tracks) {
             foreach ($tracks as $track) {
                 /** @var Track $track */
                 $oldSongs = $track->showSongs;
diff --git a/app/Jobs/EncodeTrackFile.php b/app/Jobs/EncodeTrackFile.php
index 9bdfb564..aba8f1b7 100644
--- a/app/Jobs/EncodeTrackFile.php
+++ b/app/Jobs/EncodeTrackFile.php
@@ -65,7 +65,7 @@ class EncodeTrackFile extends Job implements SelfHandling, ShouldQueue
      */
     public function __construct(TrackFile $trackFile, $isExpirable, $isForUpload = false, $autoPublish = false)
     {
-        if(
+        if (
             (!$isForUpload && $trackFile->is_master) ||
             ($isForUpload && $trackFile->is_master && !$trackFile->getFormat()['is_lossless'])
         ) {
diff --git a/app/Jobs/UpdateTagsForRenamedGenre.php b/app/Jobs/UpdateTagsForRenamedGenre.php
index ab948e1f..2ce9a037 100644
--- a/app/Jobs/UpdateTagsForRenamedGenre.php
+++ b/app/Jobs/UpdateTagsForRenamedGenre.php
@@ -83,7 +83,7 @@ class UpdateTagsForRenamedGenre extends Job implements SelfHandling, ShouldQueue
         }
 
 
-        $this->genreThatWasRenamed->tracks()->chunk(200, function ($tracks) {
+        $this->genreThatWasRenamed->tracks()->chunk(200, function($tracks) {
             foreach ($tracks as $track) {
                 /** @var Track $track */
                 $track->updateTags();
diff --git a/app/Jobs/UpdateTagsForRenamedShowSong.php b/app/Jobs/UpdateTagsForRenamedShowSong.php
index a39a09da..15b84da4 100644
--- a/app/Jobs/UpdateTagsForRenamedShowSong.php
+++ b/app/Jobs/UpdateTagsForRenamedShowSong.php
@@ -82,7 +82,7 @@ class UpdateTagsForRenamedShowSong extends Job implements SelfHandling, ShouldQu
         }
 
 
-        $this->songThatWasRenamed->tracks()->chunk(200, function ($tracks) {
+        $this->songThatWasRenamed->tracks()->chunk(200, function($tracks) {
             foreach ($tracks as $track) {
                 /** @var Track $track */
                 $track->updateTags();
diff --git a/app/Models/Album.php b/app/Models/Album.php
index 3859256b..7378ebfc 100644
--- a/app/Models/Album.php
+++ b/app/Models/Album.php
@@ -398,6 +398,9 @@ class Album extends Model implements Searchable, Commentable, Favouritable
         }
     }
 
+    /**
+     * @param string $key
+     */
     public function getCacheKey($key)
     {
         return 'album-'.$this->id.'-'.$key;
diff --git a/app/Models/Comment.php b/app/Models/Comment.php
index 0d71ce05..6f7fd3f1 100644
--- a/app/Models/Comment.php
+++ b/app/Models/Comment.php
@@ -24,7 +24,6 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Poniverse\Ponyfm\Contracts\Commentable;
-use Poniverse\Ponyfm\Contracts\GeneratesNotifications;
 
 /**
  * Poniverse\Ponyfm\Models\Comment
diff --git a/app/Models/Genre.php b/app/Models/Genre.php
index 0569e539..7030c085 100644
--- a/app/Models/Genre.php
+++ b/app/Models/Genre.php
@@ -53,7 +53,7 @@ class Genre extends Model
 
     use SlugTrait, SoftDeletes, RevisionableTrait;
 
-    public function tracks(){
+    public function tracks() {
         return $this->hasMany(Track::class, 'genre_id');
     }
 
diff --git a/app/Models/Image.php b/app/Models/Image.php
index 882e8d0c..b736f170 100644
--- a/app/Models/Image.php
+++ b/app/Models/Image.php
@@ -93,7 +93,7 @@ class Image extends Model
                     return Str::startsWith($filename, $imagePrefix);
                 });
 
-                foreach($filenames as $filename) {
+                foreach ($filenames as $filename) {
                     unlink($image->getDirectory().'/'.$filename);
                 }
             } else {
@@ -119,7 +119,7 @@ class Image extends Model
 
                 } else {
                     // ImageMagick options reference: http://www.imagemagick.org/script/command-line-options.php
-                    $command = 'convert 2>&1 "' . $file->getPathname() . '" -background white -alpha remove -alpha off -strip';
+                    $command = 'convert 2>&1 "'.$file->getPathname().'" -background white -alpha remove -alpha off -strip';
 
                     if ($image->mime === 'image/jpeg') {
                         $command .= ' -quality 100 -format jpeg';
@@ -132,7 +132,7 @@ class Image extends Model
                         $command .= " -thumbnail ${coverType['width']}x${coverType['height']}^ -gravity center -extent ${coverType['width']}x${coverType['height']}";
                     }
 
-                    $command .= ' "' . $image->getFile($coverType['id']) . '"';
+                    $command .= ' "'.$image->getFile($coverType['id']).'"';
                 }
 
                 External::execute($command);
@@ -157,21 +157,21 @@ class Image extends Model
 
     public function getFile($type = self::NORMAL)
     {
-        return $this->getDirectory() . '/' . $this->getFilename($type);
+        return $this->getDirectory().'/'.$this->getFilename($type);
     }
 
     public function getFilename($type = self::NORMAL)
     {
         $typeInfo = self::$ImageTypes[$type];
 
-        return $this->id . '_' . $typeInfo['name'] . '.'.$this->extension;
+        return $this->id.'_'.$typeInfo['name'].'.'.$this->extension;
     }
 
     public function getDirectory()
     {
-        $dir = (string)(floor($this->id / 100) * 100);
+        $dir = (string) (floor($this->id / 100) * 100);
 
-        return Config::get('ponyfm.files_directory') . '/images/' . $dir;
+        return Config::get('ponyfm.files_directory').'/images/'.$dir;
     }
 
     public function ensureDirectoryExists()
diff --git a/app/Models/Playlist.php b/app/Models/Playlist.php
index ebeffc1e..eda544f5 100644
--- a/app/Models/Playlist.php
+++ b/app/Models/Playlist.php
@@ -98,7 +98,7 @@ class Playlist extends Model implements Searchable, Commentable, Favouritable
     {
         if (Auth::check()) {
             $query->with([
-                'users' => function ($query) {
+                'users' => function($query) {
                     $query->whereUserId(Auth::user()->id);
                 }
             ]);
@@ -138,8 +138,8 @@ class Playlist extends Model implements Searchable, Commentable, Favouritable
         $data['formats'] = $formats;
         $data['share'] = [
             'url' => action('PlaylistsController@getShortlink', ['id' => $playlist->id]),
-            'tumblrUrl' => 'http://www.tumblr.com/share/link?url=' . urlencode($playlist->url) . '&name=' . urlencode($playlist->title) . '&description=' . urlencode($playlist->description),
-            'twitterUrl' => 'https://platform.twitter.com/widgets/tweet_button.html?text=' . $playlist->title . ' by ' . $playlist->user->display_name . ' on Pony.fm'
+            'tumblrUrl' => 'http://www.tumblr.com/share/link?url='.urlencode($playlist->url).'&name='.urlencode($playlist->title).'&description='.urlencode($playlist->description),
+            'twitterUrl' => 'https://platform.twitter.com/widgets/tweet_button.html?text='.$playlist->title.' by '.$playlist->user->display_name.' on Pony.fm'
         ];
 
         return $data;
@@ -159,25 +159,25 @@ class Playlist extends Model implements Searchable, Commentable, Favouritable
             $userRow = $playlist->users[0];
             $userData = [
                 'stats' => [
-                    'views' => (int)$userRow->view_count,
-                    'downloads' => (int)$userRow->download_count,
+                    'views' => (int) $userRow->view_count,
+                    'downloads' => (int) $userRow->download_count,
                 ],
-                'is_favourited' => (bool)$userRow->is_favourited
+                'is_favourited' => (bool) $userRow->is_favourited
             ];
         }
 
         return [
-            'id' => (int)$playlist->id,
+            'id' => (int) $playlist->id,
             'track_count' => $playlist->track_count,
             'title' => $playlist->title,
             'slug' => $playlist->slug,
             'created_at' => $playlist->created_at->format('c'),
-            'is_public' => (bool)$playlist->is_public,
+            'is_public' => (bool) $playlist->is_public,
             'stats' => [
-                'views' => (int)$playlist->view_count,
-                'downloads' => (int)$playlist->download_count,
-                'comments' => (int)$playlist->comment_count,
-                'favourites' => (int)$playlist->favourite_count
+                'views' => (int) $playlist->view_count,
+                'downloads' => (int) $playlist->download_count,
+                'comments' => (int) $playlist->comment_count,
+                'favourites' => (int) $playlist->favourite_count
             ],
             'covers' => [
                 'small' => $playlist->getCoverUrl(Image::SMALL),
@@ -186,7 +186,7 @@ class Playlist extends Model implements Searchable, Commentable, Favouritable
             ],
             'url' => $playlist->url,
             'user' => [
-                'id' => (int)$playlist->user->id,
+                'id' => (int) $playlist->user->id,
                 'name' => $playlist->user->display_name,
                 'url' => $playlist->user->url,
             ],
@@ -274,7 +274,7 @@ class Playlist extends Model implements Searchable, Commentable, Favouritable
             return 0;
         }
 
-        return Cache::remember($this->getCacheKey('filesize-' . $format), 1440, function () use ($tracks, $format) {
+        return Cache::remember($this->getCacheKey('filesize-'.$format), 1440, function() use ($tracks, $format) {
             $size = 0;
             foreach ($tracks as $track) {
                 /** @var $track Track */
@@ -313,7 +313,7 @@ class Playlist extends Model implements Searchable, Commentable, Favouritable
 
     private function getCacheKey($key)
     {
-        return 'playlist-' . $this->id . '-' . $key;
+        return 'playlist-'.$this->id.'-'.$key;
     }
 
     /**
diff --git a/app/Models/ResourceLogItem.php b/app/Models/ResourceLogItem.php
index 643be428..05534ab3 100644
--- a/app/Models/ResourceLogItem.php
+++ b/app/Models/ResourceLogItem.php
@@ -51,7 +51,7 @@ class ResourceLogItem extends Model
 
     public static function logItem($resourceType, $resourceId, $logType, $formatId = null)
     {
-        $resourceIdColumn = $resourceType . '_id';
+        $resourceIdColumn = $resourceType.'_id';
 
         $logItem = new ResourceLogItem();
         $logItem->{$resourceIdColumn} = $resourceId;
@@ -66,7 +66,7 @@ class ResourceLogItem extends Model
 
         $logItem->save();
 
-        $resourceTable = $resourceType . 's';
+        $resourceTable = $resourceType.'s';
         $countColumn = '';
 
         if ($logType == self::VIEW) {
@@ -92,9 +92,9 @@ class ResourceLogItem extends Model
                 FROM
                     resource_log_items
                 WHERE ' .
-                    $resourceIdColumn . ' = ' . $resourceId . '
+                    $resourceIdColumn.' = '.$resourceId.'
                 AND
-                    log_type = ' . $logType . ')')
+                    log_type = ' . $logType.')')
         ]);
 
         if (Auth::check()) {
@@ -106,11 +106,11 @@ class ResourceLogItem extends Model
                     FROM
                         resource_log_items
                     WHERE
-                        user_id = ' . Auth::user()->id . '
+                        user_id = ' . Auth::user()->id.'
                     AND ' .
-                        $resourceIdColumn . ' = ' . $resourceId . '
+                        $resourceIdColumn.' = '.$resourceId.'
                     AND
-                        log_type = ' . $logType . ')')
+                        log_type = ' . $logType.')')
             ]);
         }
     }
diff --git a/app/Models/ResourceUser.php b/app/Models/ResourceUser.php
index 5b1413af..bc727187 100644
--- a/app/Models/ResourceUser.php
+++ b/app/Models/ResourceUser.php
@@ -45,7 +45,7 @@ class ResourceUser extends Model
 
     public static function get($userId, $resourceType, $resourceId)
     {
-        $resourceIdColumn = $resourceType . '_id';
+        $resourceIdColumn = $resourceType.'_id';
         $existing = self::where($resourceIdColumn, '=', $resourceId)->where('user_id', '=', $userId)->first();
         if ($existing) {
             return $existing;
diff --git a/app/Models/TrackFile.php b/app/Models/TrackFile.php
index 77521cd0..ad6a0d10 100644
--- a/app/Models/TrackFile.php
+++ b/app/Models/TrackFile.php
@@ -142,9 +142,9 @@ class TrackFile extends Model
 
     public function getDirectory()
     {
-        $dir = (string)(floor($this->track_id / 100) * 100);
+        $dir = (string) (floor($this->track_id / 100) * 100);
 
-        return \Config::get('ponyfm.files_directory') . '/tracks/' . $dir;
+        return \Config::get('ponyfm.files_directory').'/tracks/'.$dir;
     }
 
     public function getFile()
@@ -164,7 +164,7 @@ class TrackFile extends Model
 
     private function getCacheKey($key)
     {
-        return 'track_file-' . $this->id . '-' . $key;
+        return 'track_file-'.$this->id.'-'.$key;
     }
 
     /**
diff --git a/app/Models/User.php b/app/Models/User.php
index bacd4879..bf739743 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -117,7 +117,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
         $slugBeingTried = $baseSlug;
         $counter = 2;
 
-        while(true) {
+        while (true) {
             $existingEntity = static::where('slug', $slugBeingTried)->first();
             $validator = Validator::make(['slug' => $slugBeingTried], ['isNotReservedSlug']);
 
diff --git a/app/Providers/NotificationServiceProvider.php b/app/Providers/NotificationServiceProvider.php
index 76103e93..2acecac1 100644
--- a/app/Providers/NotificationServiceProvider.php
+++ b/app/Providers/NotificationServiceProvider.php
@@ -43,7 +43,7 @@ class NotificationServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $this->app->singleton('notification', function(Application $app){
+        $this->app->singleton('notification', function(Application $app) {
             return new NotificationManager();
         });
     }
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 39111b4f..4e8a0dcb 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -56,7 +56,7 @@ class RouteServiceProvider extends ServiceProvider
      */
     public function map(Router $router)
     {
-        $router->group(['namespace' => $this->namespace], function ($router) {
+        $router->group(['namespace' => $this->namespace], function($router) {
             require app_path('Http/routes.php');
         });
     }
diff --git a/app/Traits/IndexedInElasticsearchTrait.php b/app/Traits/IndexedInElasticsearchTrait.php
index 8254521a..21dba679 100644
--- a/app/Traits/IndexedInElasticsearchTrait.php
+++ b/app/Traits/IndexedInElasticsearchTrait.php
@@ -47,11 +47,11 @@ trait IndexedInElasticsearchTrait
 
     // Laravel automatically runs this method based on the trait's name. #magic
     public static function bootIndexedInElasticsearchTrait() {
-        static::saved(function (Searchable $entity) {
+        static::saved(function(Searchable $entity) {
             $entity->updateElasticsearchEntry();
         });
 
-        static::deleted(function (Searchable $entity) {
+        static::deleted(function(Searchable $entity) {
             $entity->updateElasticsearchEntry();
         });
     }
diff --git a/app/Traits/TrackCollection.php b/app/Traits/TrackCollection.php
index 9b4bd938..f9073b0b 100644
--- a/app/Traits/TrackCollection.php
+++ b/app/Traits/TrackCollection.php
@@ -83,7 +83,7 @@ trait TrackCollection
                 $trackFile->is_master ||
                 ($trackFile->expires_at != null && File::exists($trackFile->getFile()))
             ) {
-                $availableCount ++;
+                $availableCount++;
             }
         }
 
@@ -118,7 +118,7 @@ trait TrackCollection
      */
     protected function downloadableTrackFiles($format) {
         return $this->trackFiles()->with([
-            'track' => function ($query) {
+            'track' => function($query) {
                 $query->where('is_downloadable', true);
             }
         ])->where('format', $format)->get();