diff --git a/include/InstrumentPlayHandle.h b/include/InstrumentPlayHandle.h
index 1455134e6..dc744b4ff 100644
--- a/include/InstrumentPlayHandle.h
+++ b/include/InstrumentPlayHandle.h
@@ -37,23 +37,22 @@ class InstrumentTrack;
 class LMMS_EXPORT InstrumentPlayHandle : public PlayHandle
 {
 public:
-	InstrumentPlayHandle( Instrument * instrument, InstrumentTrack* instrumentTrack );
+	InstrumentPlayHandle(Instrument * instrument, InstrumentTrack* instrumentTrack);
 
 	~InstrumentPlayHandle() override = default;
 
-	void play( sampleFrame * _working_buffer ) override;
+	void play(sampleFrame * working_buffer) override;
 
 	bool isFinished() const override
 	{
 		return false;
 	}
 
-	bool isFromTrack( const Track* _track ) const override;
+	bool isFromTrack(const Track* track) const override;
 
 private:
 	Instrument* m_instrument;
-} ;
-
+};
 
 } // namespace lmms
 
diff --git a/src/core/InstrumentPlayHandle.cpp b/src/core/InstrumentPlayHandle.cpp
index 30f5fde38..097719ad8 100644
--- a/src/core/InstrumentPlayHandle.cpp
+++ b/src/core/InstrumentPlayHandle.cpp
@@ -33,48 +33,48 @@ namespace lmms
 {
 
 
-InstrumentPlayHandle::InstrumentPlayHandle( Instrument * instrument, InstrumentTrack* instrumentTrack ) :
-		PlayHandle( Type::InstrumentPlayHandle ),
-		m_instrument( instrument )
+InstrumentPlayHandle::InstrumentPlayHandle(Instrument * instrument, InstrumentTrack* instrumentTrack) :
+	PlayHandle(Type::InstrumentPlayHandle),
+	m_instrument(instrument)
 {
-	setAudioPort( instrumentTrack->audioPort() );
+	setAudioPort(instrumentTrack->audioPort());
 }
 
-void InstrumentPlayHandle::play( sampleFrame * _working_buffer )
+void InstrumentPlayHandle::play(sampleFrame * working_buffer)
 {
 	InstrumentTrack * instrumentTrack = m_instrument->instrumentTrack();
 
 	// ensure that all our nph's have been processed first
-	ConstNotePlayHandleList nphv = NotePlayHandle::nphsOfInstrumentTrack(instrumentTrack, true );
+	auto nphv = NotePlayHandle::nphsOfInstrumentTrack(instrumentTrack, true);
 	
 	bool nphsLeft;
 	do
 	{
 		nphsLeft = false;
-		for( const NotePlayHandle * constNotePlayHandle : nphv )
+		for (const NotePlayHandle * constNotePlayHandle : nphv)
 		{
-			NotePlayHandle * notePlayHandle = const_cast<NotePlayHandle *>( constNotePlayHandle );
-			if( notePlayHandle->state() != ThreadableJob::ProcessingState::Done &&
-				!notePlayHandle->isFinished())
+			if (constNotePlayHandle->state() != ThreadableJob::ProcessingState::Done &&
+				!constNotePlayHandle->isFinished())
 			{
 				nphsLeft = true;
+				NotePlayHandle * notePlayHandle = const_cast<NotePlayHandle *>(constNotePlayHandle);
 				notePlayHandle->process();
 			}
 		}
 	}
-	while( nphsLeft );
+	while (nphsLeft);
 	
-	m_instrument->play( _working_buffer );
+	m_instrument->play(working_buffer);
 
 	// Process the audio buffer that the instrument has just worked on...
 	const fpp_t frames = Engine::audioEngine()->framesPerPeriod();
-	instrumentTrack->processAudioBuffer(_working_buffer, frames, nullptr);
+	instrumentTrack->processAudioBuffer(working_buffer, frames, nullptr);
 }
 
-bool InstrumentPlayHandle::isFromTrack( const Track* _track ) const
+bool InstrumentPlayHandle::isFromTrack(const Track* track) const
 {
-	return m_instrument->isFromTrack( _track );
+	return m_instrument->isFromTrack(track);
 }
 
 
-} // namespace lmms
\ No newline at end of file
+} // namespace lmms
diff --git a/src/tracks/InstrumentTrack.cpp b/src/tracks/InstrumentTrack.cpp
index c9b87a4f2..0ffde61bc 100644
--- a/src/tracks/InstrumentTrack.cpp
+++ b/src/tracks/InstrumentTrack.cpp
@@ -584,7 +584,7 @@ void InstrumentTrack::playNote( NotePlayHandle* n, sampleFrame* workingBuffer )
 		{
 			const fpp_t frames = n->framesLeftForCurrentPeriod();
 			const f_cnt_t offset = n->noteOffset();
-			this->processAudioBuffer(workingBuffer, frames + offset, n);
+			processAudioBuffer(workingBuffer, frames + offset, n);
 		}
 	}
 }