diff --git a/kweather/kcmweatherservice.cpp b/kweather/kcmweatherservice.cpp
index 4e5c7a7..af48790 100644
--- a/kweather/kcmweatherservice.cpp
+++ b/kweather/kcmweatherservice.cpp
@@ -143,7 +143,9 @@ void KCMWeatherService::updateIconTheme( bool useIconTheme )
 	DCOPRef ws( "KWeatherService", "WeatherService" );
 	DCOPReply reply = ws.call( "useIconTheme", useIconTheme );
 	if( ! reply.isValid() )
-			kdDebug(12004) << "[kcmweatherservice::updateIconTheme] DCOP call failed" << endl;
+	{
+		kdDebug(12004) << "[kcmweatherservice::updateIconTheme] DCOP call failed" << endl;
+	}
 }
 
 #include "kcmweatherservice.moc"
diff --git a/kweather/kweather.cpp b/kweather/kweather.cpp
index 1edc9cd..f1e025f 100644
--- a/kweather/kweather.cpp
+++ b/kweather/kweather.cpp
@@ -161,9 +161,9 @@ void kweather::preferences()
       settingsDialog = new KCMultiDialog( this );
       connect( settingsDialog, TQT_SIGNAL( configCommitted() ), TQT_SLOT( slotPrefsAccepted() ) );
 
-			settingsDialog->addModule( "kcmweatherapplet.desktop" );
-			settingsDialog->addModule( "kcmweatherstations.desktop" );
-			settingsDialog->addModule( "kcmweatherservice.desktop" );
+      settingsDialog->addModule( "kcmweatherapplet.desktop" );
+      settingsDialog->addModule( "kcmweatherstations.desktop" );
+      settingsDialog->addModule( "kcmweatherservice.desktop" );
     }
 
     settingsDialog->show();
@@ -335,7 +335,9 @@ void kweather::slotPrefsAccepted()
     dockWidget->setViewMode(mViewMode);
 
     if ( !mWeatherService )
+    {
         initDCOP();
+    }
     mWeatherService->forceUpdateAll();
 
     setLabelColor();
diff --git a/kweather/weatherservice.cpp b/kweather/weatherservice.cpp
index 966216b..aa8454a 100644
--- a/kweather/weatherservice.cpp
+++ b/kweather/weatherservice.cpp
@@ -150,7 +150,7 @@ TQPixmap WeatherService::icon(const TQString &stationID)
 	return kapp->iconLoader()->loadIcon(
 		iconFileName(stationID),
 		TDEIcon::Desktop
-   );
+	);
 }
 
 TQString WeatherService::currentIconString(const TQString &stationID)
@@ -165,7 +165,7 @@ TQString WeatherService::iconFileName(const TQString &stationID)
 
 void WeatherService::useIconTheme(bool use)
 {
-	kdDebug() << "[!!!] received signal to set useIconTheme to " << use << endl;
+	kdDebug(12006) << "Received signal to set useIconTheme to " << use << endl;
 	WeatherIconPrivate::instance()->useIconTheme(use);
 }
 
@@ -214,7 +214,7 @@ void WeatherService::removeStation(const TQString &stationID)
 	m_weatherLib->remove(stationID);
 	saveSettings();
 	emit stationRemoved(stationID);
-	kdDebug() << "KWeatherService: station removed: " << stationID << endl;
+	kdDebug(12006) << "Station removed: " << stationID << endl;
 }
 
 void WeatherService::addStation(const TQString &stationID)
@@ -222,7 +222,7 @@ void WeatherService::addStation(const TQString &stationID)
 	m_weatherLib->update(stationID);
 	saveSettings();
 	emit stationAdded(stationID);
-	kdDebug() << "KWeatherService: station added: " << stationID << endl;
+	kdDebug(12006) << "Station added: " << stationID << endl;
 }
 
 void WeatherService::exit()