diff --git a/gtk2_ardour/patch_change.cc b/gtk2_ardour/patch_change.cc
index 42800fc7f2..dc67562fb0 100644
--- a/gtk2_ardour/patch_change.cc
+++ b/gtk2_ardour/patch_change.cc
@@ -44,37 +44,36 @@ using Gtkmm2ext::Keyboard;
 
 /** @param x x position in pixels.
  */
-PatchChange::PatchChange(MidiRegionView&                   region,
-                         ArdourCanvas::Container*          parent,
-                         double                            height,
-                         double                            x,
-                         double                            y,
-                         ARDOUR::InstrumentInfo&           info,
-                         ARDOUR::MidiModel::PatchChangePtr patch,
-			 Gtkmm2ext::Color               outline_color,
-			 Gtkmm2ext::Color               fill_color)
+PatchChange::PatchChange (MidiRegionView&                   region,
+                          ArdourCanvas::Container*          parent,
+                          double                            height,
+                          double                            x,
+                          double                            y,
+                          ARDOUR::InstrumentInfo&           info,
+                          ARDOUR::MidiModel::PatchChangePtr patch,
+                          Gtkmm2ext::Color                  outline_color,
+                          Gtkmm2ext::Color                  fill_color)
 	: _region (region)
 	, _info (info)
 	, _patch (patch)
-	, _popup_initialized(false)
+	, _popup_initialized (false)
 {
-	_flag = new ArdourCanvas::Flag (
-		parent,
-		height,
-		outline_color,
-		fill_color,
-		ArdourCanvas::Duple (x, y),
-		true);
+	_flag = new ArdourCanvas::Flag (parent,
+	                                height,
+	                                outline_color,
+	                                fill_color,
+	                                ArdourCanvas::Duple (x, y),
+	                                true);
 
 	CANVAS_DEBUG_NAME (_flag, _info.get_patch_name (_patch->bank (), _patch->program (), _patch->channel ()));
 
 	_flag->Event.connect (sigc::mem_fun (*this, &PatchChange::event_handler));
-	_flag->set_font_description (UIConfiguration::instance().get_SmallFont());
+	_flag->set_font_description (UIConfiguration::instance ().get_SmallFont ());
 
 	update_name ();
 }
 
-PatchChange::~PatchChange()
+PatchChange::~PatchChange ()
 {
 	delete _flag;
 }
@@ -86,73 +85,66 @@ PatchChange::update_name ()
 }
 
 void
-PatchChange::initialize_popup_menus()
+PatchChange::initialize_popup_menus ()
 {
 	using namespace MIDI::Name;
 
-	boost::shared_ptr<ChannelNameSet> channel_name_set = _info.get_patches (_patch->channel());
+	boost::shared_ptr<ChannelNameSet> channel_name_set = _info.get_patches (_patch->channel ());
 
-	if (!channel_name_set || channel_name_set->patch_banks().size () == 0) {
+	if (!channel_name_set || channel_name_set->patch_banks ().size () == 0) {
 		return;
 	}
 
-	const ChannelNameSet::PatchBanks& patch_banks = channel_name_set->patch_banks();
-
-	if (patch_banks.size() > 1) {
+	const ChannelNameSet::PatchBanks& patch_banks = channel_name_set->patch_banks ();
 
+	if (patch_banks.size () > 1) {
 		// fill popup menu:
-		Gtk::Menu::MenuList& patch_bank_menus = _popup.items();
+		Gtk::Menu::MenuList& patch_bank_menus = _popup.items ();
 
-		for (ChannelNameSet::PatchBanks::const_iterator bank = patch_banks.begin();
-		     bank != patch_banks.end();
-		     ++bank) {
-			Glib::RefPtr<Glib::Regex> underscores = Glib::Regex::create("_");
-			std::string replacement(" ");
+		for (ChannelNameSet::PatchBanks::const_iterator bank = patch_banks.begin (); bank != patch_banks.end (); ++bank) {
+			Glib::RefPtr<Glib::Regex> underscores = Glib::Regex::create ("_");
+			std::string const&        replacement (" ");
 
-			Gtk::Menu& patch_bank_menu = *manage(new Gtk::Menu());
+			Gtk::Menu& patch_bank_menu = *manage (new Gtk::Menu ());
 
-			const PatchNameList& patches = (*bank)->patch_name_list();
-			Gtk::Menu::MenuList& patch_menus = patch_bank_menu.items();
+			const PatchNameList& patches     = (*bank)->patch_name_list ();
+			Gtk::Menu::MenuList& patch_menus = patch_bank_menu.items ();
 
-			for (PatchNameList::const_iterator patch = patches.begin();
-			     patch != patches.end();
-			     ++patch) {
-				std::string name = underscores->replace((*patch)->name().c_str(), -1, 0, replacement);
+			for (PatchNameList::const_iterator patch = patches.begin (); patch != patches.end (); ++patch) {
 
-				patch_menus.push_back(
-					Gtk::Menu_Helpers::MenuElem(
-						name,
-						sigc::bind(
-							sigc::mem_fun(*this, &PatchChange::on_patch_menu_selected),
-							(*patch)->patch_primary_key())) );
+				std::string name = underscores->replace ((*patch)->name ().c_str (), -1, 0, replacement);
+
+				patch_menus.push_back (
+				    Gtk::Menu_Helpers::MenuElem (
+				        name,
+				        sigc::bind (sigc::mem_fun (*this, &PatchChange::on_patch_menu_selected), (*patch)->patch_primary_key ())));
 			}
 
+			std::string name = underscores->replace ((*bank)->name ().c_str (), -1, 0, replacement);
 
-			std::string name = underscores->replace((*bank)->name().c_str(), -1, 0, replacement);
-
-			patch_bank_menus.push_back(
-				Gtk::Menu_Helpers::MenuElem(
-					name,
-					patch_bank_menu) );
+			patch_bank_menus.push_back (
+			    Gtk::Menu_Helpers::MenuElem (
+			        name,
+			        patch_bank_menu));
 		}
 
 	} else {
 		/* only one patch bank, so make it the initial menu */
 
-		const PatchNameList& patches = patch_banks.front()->patch_name_list();
-		Gtk::Menu::MenuList& patch_menus = _popup.items();
+		const PatchNameList& patches     = patch_banks.front ()->patch_name_list ();
+		Gtk::Menu::MenuList& patch_menus = _popup.items ();
 
-		for (PatchNameList::const_iterator patch = patches.begin();
-		     patch != patches.end();
+		for (PatchNameList::const_iterator patch = patches.begin ();
+		     patch != patches.end ();
 		     ++patch) {
-			patch_menus.push_back (Gtkmm2ext::MenuElemNoMnemonic ((*patch)->name(),
-						sigc::bind (sigc::mem_fun(*this, &PatchChange::on_patch_menu_selected), (*patch)->patch_primary_key())));
+			patch_menus.push_back (Gtkmm2ext::MenuElemNoMnemonic ((*patch)->name (),
+			                                                      sigc::bind (sigc::mem_fun (*this, &PatchChange::on_patch_menu_selected), (*patch)->patch_primary_key ())));
 		}
 	}
 }
 
 void
-PatchChange::on_patch_menu_selected(const PatchPrimaryKey& key)
+PatchChange::on_patch_menu_selected (const PatchPrimaryKey& key)
 {
 	_region.change_patch_change (*this, key);
 }
@@ -161,93 +153,86 @@ bool
 PatchChange::event_handler (GdkEvent* ev)
 {
 	/* XXX: icky dcast */
-	Editor* e = dynamic_cast<Editor*> (&_region.get_time_axis_view().editor());
+	Editor* e = dynamic_cast<Editor*> (&_region.get_time_axis_view ().editor ());
 
-	if (!e->internal_editing()) {
+	if (!e->internal_editing ()) {
 		return false;
 	}
 
 	switch (ev->type) {
-	case GDK_BUTTON_PRESS:
-		if (e->current_mouse_mode() == Editing::MouseContent) {
+		case GDK_BUTTON_PRESS:
+			if (e->current_mouse_mode () == Editing::MouseContent) {
+				if (Gtkmm2ext::Keyboard::is_delete_event (&ev->button)) {
+					_region.delete_patch_change (this);
+					return true;
 
-			if (Gtkmm2ext::Keyboard::is_delete_event (&ev->button)) {
+				} else if (Gtkmm2ext::Keyboard::is_edit_event (&ev->button)) {
+					_region.edit_patch_change (this);
+					return true;
 
-				_region.delete_patch_change (this);
-				return true;
+				} else if (ev->button.button == 1) {
+					e->drags ()->set (new PatchChangeDrag (e, this, &_region), ev);
+					return true;
+				}
+			}
 
-			} else if (Gtkmm2ext::Keyboard::is_edit_event (&ev->button)) {
-
-				_region.edit_patch_change (this);
-				return true;
-
-			} else if (ev->button.button == 1) {
-				e->drags()->set (new PatchChangeDrag (e, this, &_region), ev);
+			if (Gtkmm2ext::Keyboard::is_context_menu_event (&ev->button)) {
+				if (!_popup_initialized) {
+					initialize_popup_menus ();
+					_popup_initialized = true;
+				}
+				_popup.popup (ev->button.button, ev->button.time);
 				return true;
 			}
-		}
+			break;
 
-		if (Gtkmm2ext::Keyboard::is_context_menu_event (&ev->button)) {
-			if (!_popup_initialized) {
-				initialize_popup_menus();
-				_popup_initialized = true;
+		case GDK_KEY_PRESS:
+			switch (ev->key.keyval) {
+				case GDK_Up:
+				case GDK_KP_Up:
+				case GDK_uparrow:
+					_region.step_patch (*this, Keyboard::modifier_state_contains (ev->key.state, Keyboard::TertiaryModifier), 1);
+					return true;
+				case GDK_Down:
+				case GDK_KP_Down:
+				case GDK_downarrow:
+					_region.step_patch (*this, Keyboard::modifier_state_contains (ev->key.state, Keyboard::TertiaryModifier), -1);
+					return true;
+				default:
+					break;
 			}
-			_popup.popup(ev->button.button, ev->button.time);
-			return true;
-		}
-		break;
+			break;
+
+		case GDK_KEY_RELEASE:
+			switch (ev->key.keyval) {
+				case GDK_BackSpace:
+				case GDK_Delete:
+					_region.delete_patch_change (this);
+				default:
+					break;
+			}
+			break;
+
+		case GDK_SCROLL:
+			if (ev->scroll.direction == GDK_SCROLL_UP) {
+				_region.step_patch (*this, Keyboard::modifier_state_contains (ev->scroll.state, Keyboard::TertiaryModifier), 1);
+				return true;
+			} else if (ev->scroll.direction == GDK_SCROLL_DOWN) {
+				_region.step_patch (*this, Keyboard::modifier_state_contains (ev->scroll.state, Keyboard::TertiaryModifier), -1);
+				return true;
+			}
+			break;
+
+		case GDK_ENTER_NOTIFY:
+			_region.patch_entered (this);
+			break;
+
+		case GDK_LEAVE_NOTIFY:
+			_region.patch_left (this);
+			break;
 
-	case GDK_KEY_PRESS:
-		switch (ev->key.keyval) {
-		case GDK_Up:
-		case GDK_KP_Up:
-		case GDK_uparrow:
-			_region.step_patch(
-				*this, Keyboard::modifier_state_contains(ev->key.state, Keyboard::TertiaryModifier), 1);
-			return true;
-		case GDK_Down:
-		case GDK_KP_Down:
-		case GDK_downarrow:
-			_region.step_patch(
-				*this, Keyboard::modifier_state_contains(ev->key.state, Keyboard::TertiaryModifier), -1);
-			return true;
 		default:
 			break;
-		}
-		break;
-
-	case GDK_KEY_RELEASE:
-		switch (ev->key.keyval) {
-		case GDK_BackSpace:
-		case GDK_Delete:
-			_region.delete_patch_change (this);
-		default:
-			break;
-		}
-		break;
-
-	case GDK_SCROLL:
-		if (ev->scroll.direction == GDK_SCROLL_UP) {
-			_region.step_patch(
-				*this, Keyboard::modifier_state_contains(ev->scroll.state, Keyboard::TertiaryModifier), 1);
-			return true;
-		} else if (ev->scroll.direction == GDK_SCROLL_DOWN) {
-			_region.step_patch(
-				*this, Keyboard::modifier_state_contains(ev->scroll.state, Keyboard::TertiaryModifier), -1);
-			return true;
-		}
-		break;
-
-	case GDK_ENTER_NOTIFY:
-		_region.patch_entered (this);
-		break;
-
-	case GDK_LEAVE_NOTIFY:
-		_region.patch_left (this);
-		break;
-
-	default:
-		break;
 	}
 
 	return false;