diff --git a/src/organize/organize.cpp b/src/organize/organize.cpp
index d91bff343..fccd8bae2 100644
--- a/src/organize/organize.cpp
+++ b/src/organize/organize.cpp
@@ -292,7 +292,7 @@ void Organize::ProcessSomeFiles() {
 
 }
 
-Song::FileType Organize::CheckTranscode(Song::FileType original_type) const {
+Song::FileType Organize::CheckTranscode(const Song::FileType original_type) const {
 
   if (original_type == Song::FileType::Stream) return Song::FileType::Unknown;
 
@@ -319,7 +319,7 @@ Song::FileType Organize::CheckTranscode(Song::FileType original_type) const {
 
 }
 
-void Organize::SetSongProgress(float progress, bool transcoded) {
+void Organize::SetSongProgress(const float progress, const bool transcoded) {
 
   const int max = transcoded ? 50 : 100;
   current_copy_progress_ = (transcoded ? 50 : 0) + qBound(0, static_cast<int>(progress * static_cast<float>(max)), max - 1);
@@ -359,7 +359,7 @@ void Organize::UpdateProgress() {
 
 }
 
-void Organize::FileTranscoded(const QString &input, const QString &output, bool success) {
+void Organize::FileTranscoded(const QString &input, const QString &output, const bool success) {
 
   Q_UNUSED(output);
 
diff --git a/src/organize/organize.h b/src/organize/organize.h
index aea8995fe..150fe0de8 100644
--- a/src/organize/organize.h
+++ b/src/organize/organize.h
@@ -87,13 +87,13 @@ class Organize : public QObject {
 
  private Q_SLOTS:
   void ProcessSomeFiles();
-  void FileTranscoded(const QString &input, const QString &output, bool success);
+  void FileTranscoded(const QString &input, const QString &output, const bool success);
   void LogLine(const QString &message);
 
  private:
-  void SetSongProgress(float progress, bool transcoded = false);
+  void SetSongProgress(const float progress, const bool transcoded = false);
   void UpdateProgress();
-  Song::FileType CheckTranscode(Song::FileType original_type) const;
+  Song::FileType CheckTranscode(const Song::FileType original_type) const;
 
  private:
   struct Task {
diff --git a/src/organize/organizedialog.cpp b/src/organize/organizedialog.cpp
index e63666692..0e49bb5a7 100644
--- a/src/organize/organizedialog.cpp
+++ b/src/organize/organizedialog.cpp
@@ -411,7 +411,6 @@ void OrganizeDialog::SetLoadingSongs(const bool loading) {
 SongList OrganizeDialog::LoadSongsBlocking(const QStringList &filenames) const {
 
   SongList songs;
-  Song song;
 
   QStringList filenames_copy = filenames;
   while (!filenames_copy.isEmpty()) {
@@ -427,6 +426,7 @@ SongList OrganizeDialog::LoadSongsBlocking(const QStringList &filenames) const {
       continue;
     }
 
+    Song song;
     const TagReaderResult result = tagreader_client_->ReadFileBlocking(filename, &song);
     if (result.success() && song.is_valid()) {
       songs << song;
@@ -476,6 +476,7 @@ Organize::NewSongInfoList OrganizeDialog::ComputeNewSongsFilenames(const SongLis
     }
     new_songs_info << Organize::NewSongInfo(song, result.filename, result.unique_filename);
   }
+
   return new_songs_info;
 
 }
diff --git a/src/scrobbler/audioscrobbler.cpp b/src/scrobbler/audioscrobbler.cpp
index 704342ab6..85032918b 100644
--- a/src/scrobbler/audioscrobbler.cpp
+++ b/src/scrobbler/audioscrobbler.cpp
@@ -77,11 +77,7 @@ void AudioScrobbler::RemoveService(ScrobblerServicePtr service) {
 
 QList<ScrobblerServicePtr> AudioScrobbler::GetAll() {
 
-  QList<ScrobblerServicePtr> services;
-
-    services = services_.values();
-
-  return services;
+  return services_.values();
 
 }
 
diff --git a/src/scrobbler/scrobblingapi20.cpp b/src/scrobbler/scrobblingapi20.cpp
index 97251db8e..d9e857605 100644
--- a/src/scrobbler/scrobblingapi20.cpp
+++ b/src/scrobbler/scrobblingapi20.cpp
@@ -248,6 +248,7 @@ void ScrobblingAPI20::Authenticate() {
     default:
       break;
   }
+
 }
 
 void ScrobblingAPI20::RedirectArrived() {
@@ -474,6 +475,7 @@ void ScrobblingAPI20::Scrobble(const Song &song) {
   }
 
   StartSubmit(true);
+
 }
 
 void ScrobblingAPI20::StartSubmit(const bool initial) {
@@ -693,7 +695,7 @@ void ScrobblingAPI20::ScrobbleRequestFinished(QNetworkReply *reply, ScrobblerCac
       qLog(Debug) << name_ << "Scrobble for" << song << "accepted";
     }
 
- }
+  }
 
   StartSubmit();
 
@@ -922,6 +924,7 @@ void ScrobblingAPI20::Error(const QString &error, const QVariant &debug) {
   if (settings_->show_error_dialog()) {
     Q_EMIT ErrorMessage(tr("Scrobbler %1 error: %2").arg(name_, error));
   }
+
 }
 
 QString ScrobblingAPI20::ErrorString(const ScrobbleErrorCode error) {