diff --git a/include/InstrumentMidiIOView.h b/include/InstrumentMidiIOView.h
index 40081e2cd..7ca1339a8 100644
--- a/include/InstrumentMidiIOView.h
+++ b/include/InstrumentMidiIOView.h
@@ -2,7 +2,7 @@
  * InstrumentMidiIOView.h - widget in instrument-track-window for setting
  *                          up MIDI-related stuff
  *
- * Copyright (c) 2005-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2005-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef _INSTRUMENT_MIDI_IO_VIEW_H
-#define _INSTRUMENT_MIDI_IO_VIEW_H
+#ifndef INSTRUMENT_MIDI_IO_VIEW_H
+#define INSTRUMENT_MIDI_IO_VIEW_H
 
 #include <QtGui/QWidget>
 
@@ -39,7 +39,7 @@ class QToolButton;
 class InstrumentMidiIOView : public QWidget, public ModelView
 {
 public:
-	InstrumentMidiIOView( QWidget * _parent );
+	InstrumentMidiIOView( QWidget* parent );
 	virtual ~InstrumentMidiIOView();
 
 
diff --git a/src/gui/widgets/InstrumentMidiIOView.cpp b/src/gui/widgets/InstrumentMidiIOView.cpp
index 03f3edf0d..55988a9d4 100644
--- a/src/gui/widgets/InstrumentMidiIOView.cpp
+++ b/src/gui/widgets/InstrumentMidiIOView.cpp
@@ -158,10 +158,8 @@ void InstrumentMidiIOView::modelChanged()
 
 	m_midiOutputGroupBox->setModel( &mp->m_writableModel );
 	m_outputChannelSpinBox->setModel( &mp->m_outputChannelModel );
-	m_fixedOutputVelocitySpinBox->setModel(
-					&mp->m_fixedOutputVelocityModel );
-	m_fixedOutputNoteSpinBox->setModel(
-					&mp->m_fixedOutputNoteModel );
+	m_fixedOutputVelocitySpinBox->setModel( &mp->m_fixedOutputVelocityModel );
+	m_fixedOutputNoteSpinBox->setModel( &mp->m_fixedOutputNoteModel );
 	m_outputProgramSpinBox->setModel( &mp->m_outputProgramModel );
 
 	if( m_rpBtn )