diff --git a/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylistEntries.cpp b/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylistEntries.cpp
index e5862f7d9..d2a1e4277 100644
--- a/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylistEntries.cpp
+++ b/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylistEntries.cpp
@@ -45,9 +45,9 @@ DatabaseCommand_LoadDynamicPlaylistEntries::exec( DatabaseImpl* dbi )
     // now load the controls etc
 
     TomahawkSqlQuery controlsQuery = dbi->newquery();
-    controlsQuery.prepare("SELECT playlist_revision.playlist, controls, plmode, pltype "
-                          "FROM dynamic_playlist_revision, playlist_revision "
-                          "WHERE dynamic_playlist_revision.guid = ? AND playlist_revision.guid = dynamic_playlist_revision.guid");
+    controlsQuery.prepare( "SELECT playlist_revision.playlist, controls, plmode, pltype "
+                           "FROM dynamic_playlist_revision, playlist_revision "
+                           "WHERE dynamic_playlist_revision.guid = ? AND playlist_revision.guid = dynamic_playlist_revision.guid" );
     controlsQuery.addBindValue( revisionGuid() );
     controlsQuery.exec();
 
@@ -61,20 +61,19 @@ DatabaseCommand_LoadDynamicPlaylistEntries::exec( DatabaseImpl* dbi )
 //    "FROM dynamic_playlist_revision, playlist_revision "
 //    "WHERE dynamic_playlist_revision.guid = "<< revisionGuid() << " AND playlist_revision.guid = dynamic_playlist_revision.guid";
 
-    if( controlsQuery.first() )
+    if ( controlsQuery.first() )
     {
         playlist_guid = controlsQuery.value( 0 ).toString();
         bool ok;
         QVariant v = TomahawkUtils::parseJson( controlsQuery.value(1).toByteArray(), &ok );
         Q_ASSERT( ok && v.type() == QVariant::List ); //TODO
 
-
         type = controlsQuery.value( 3 ).toString();
         mode = static_cast<GeneratorMode>( controlsQuery.value( 2 ).toInt() );
 
         QStringList controlIds = v.toStringList();
 //        qDebug() << "Got controls in dynamic playlist, loading:" << controlIds << controlsQuery.value(1);
-        foreach( const QString& controlId, controlIds )
+        foreach ( const QString& controlId, controlIds )
         {
             TomahawkSqlQuery controlQuery = dbi->newquery();
             controlQuery.prepare( "SELECT selectedType, match, input "
@@ -82,7 +81,7 @@ DatabaseCommand_LoadDynamicPlaylistEntries::exec( DatabaseImpl* dbi )
                                   "WHERE id = :id" );
             controlQuery.bindValue( ":id", controlId );
             controlQuery.exec();
-            if( controlQuery.next() )
+            if ( controlQuery.next() )
             {
                 QVariantMap c;
                 c[ "type" ] = type;
@@ -100,7 +99,7 @@ DatabaseCommand_LoadDynamicPlaylistEntries::exec( DatabaseImpl* dbi )
         return;
     }
 
-    if( mode == OnDemand )
+    if ( mode == OnDemand )
     {
 //        Q_ASSERT( m_entrymap.isEmpty() ); // ondemand should have no entry
 
diff --git a/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylistEntries.h b/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylistEntries.h
index b3372c594..8e514ed96 100644
--- a/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylistEntries.h
+++ b/src/libtomahawk/database/DatabaseCommand_LoadDynamicPlaylistEntries.h
@@ -48,16 +48,16 @@ public:
 signals:
     // used if loading an ondemand playlist
     void done( QString,
-                     bool,
-                     QString,
-                     QList< QVariantMap>,
-                     bool );
+               bool,
+               QString,
+               QList< QVariantMap >,
+               bool );
     // used when loading a static playlist
     void done( QString,
                QList< QString >,
                QList< QString >,
                QString,
-               QList< QVariantMap>,
+               QList< QVariantMap >,
                bool,
                QMap< QString, Tomahawk::plentry_ptr >,
                bool );
diff --git a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp
index 260cc5210..f7981f6d5 100644
--- a/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp
+++ b/src/libtomahawk/playlist/dynamic/DynamicPlaylist.cpp
@@ -315,7 +315,8 @@ DynamicPlaylist::loadRevision( const QString& rev )
     setBusy( true );
     DatabaseCommand_LoadDynamicPlaylistEntries* cmd = new DatabaseCommand_LoadDynamicPlaylistEntries( rev.isEmpty() ? currentrevision() : rev );
 
-    if ( d->generator->mode() == OnDemand ) {
+    if ( d->generator->mode() == OnDemand )
+    {
         connect( cmd, SIGNAL( done( QString,
                                     bool,
                                     QString,
@@ -325,8 +326,10 @@ DynamicPlaylist::loadRevision( const QString& rev )
                                     bool,
                                     QString,
                                     QList< QVariantMap >,
-                                    bool) ) );
-    } else if ( d->generator->mode() == Static ) {
+                                    bool ) ) );
+    }
+    else if ( d->generator->mode() == Static )
+    {
         connect( cmd, SIGNAL( done( QString,
                                     QList< QString >,
                                     QList< QString >,
@@ -345,6 +348,9 @@ DynamicPlaylist::loadRevision( const QString& rev )
                                     bool ) ) );
 
     }
+    else
+        Q_ASSERT( false );
+
     Database::instance()->enqueue( Tomahawk::dbcmd_ptr( cmd ) );
 }