diff --git a/src/devicewidget.cc b/src/devicewidget.cc
index b9b3b3c..e149ceb 100644
--- a/src/devicewidget.cc
+++ b/src/devicewidget.cc
@@ -271,7 +271,7 @@ void DeviceWidget::openRenamePopup(const Glib::VariantBase& parameter) {
 
 RenameWindow::RenameWindow(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>& x, const gchar* name, const gchar* key) :
     Gtk::ApplicationWindow(cobject),
-    deviceKey(key){
+    deviceKey(key) {
 
     renameText = x->get_widget<Gtk::Entry>("renameText");
     renameText->set_text(name);
diff --git a/src/mainwindow.cc b/src/mainwindow.cc
index 7dba1a5..9579dad 100644
--- a/src/mainwindow.cc
+++ b/src/mainwindow.cc
@@ -76,7 +76,7 @@ MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
     canRenameDevices(false),
     m_connected(false),
     m_config_filename(NULL) {
-    ca_context_create (&canberraContext);
+    ca_context_create(&canberraContext);
     ca_context_set_driver(canberraContext, "pulse");
 
     cardsVBox = x->get_widget<Gtk::Box>("cardsVBox");
@@ -286,7 +286,7 @@ static void set_icon_name_default(Gtk::Image *i, const char *name) {
             iconName = "gtk-missing-image";
             break;
         }
-        iconName = iconName.substr(0,lastDashIndex);
+        iconName = iconName.substr(0, lastDashIndex);
     }
     i->set_from_icon_name(iconName.c_str());
 }
diff --git a/src/pavucontrol.cc b/src/pavucontrol.cc
index 3ecbf2d..86d7ddd 100644
--- a/src/pavucontrol.cc
+++ b/src/pavucontrol.cc
@@ -67,8 +67,7 @@ void show_error(Gtk::Widget* widget, const char *txt) {
         Gtk::Window* window = Glib::wrap(w);
         window->present();
         dialog->choose(*window, sigc::ptr_fun(show_error_finish));
-    }
-    else {
+    } else {
         dialog->choose(sigc::ptr_fun(show_error_finish));
     }
 }