diff --git a/plugins/ladspa_effect/LadspaEffect.cpp b/plugins/ladspa_effect/LadspaEffect.cpp
index 0cf6a8267..08e087d7d 100644
--- a/plugins/ladspa_effect/LadspaEffect.cpp
+++ b/plugins/ladspa_effect/LadspaEffect.cpp
@@ -233,14 +233,8 @@ bool LadspaEffect::processAudioBuffer( sampleFrame * _buf,
 					for( fpp_t frame = 0; 
 						frame < frames; ++frame )
 					{
-						_buf[frame][channel] = 
-							d * 
-							_buf[frame][channel] +
-							w *
-							pp->buffer[frame];
-						out_sum += 
-							_buf[frame][channel] *
-							_buf[frame][channel];
+						_buf[frame][channel] = d * _buf[frame][channel] + w * pp->buffer[frame];
+						out_sum += _buf[frame][channel] * _buf[frame][channel];
 					}
 					++channel;
 					break;
diff --git a/src/core/FxMixer.cpp b/src/core/FxMixer.cpp
index ba76a78c5..a87a23392 100644
--- a/src/core/FxMixer.cpp
+++ b/src/core/FxMixer.cpp
@@ -93,8 +93,7 @@ void FxMixer::mixToChannel( const sampleFrame * _buf, fx_ch_t _ch )
 	{
 		m_fxChannels[_ch]->m_lock.lock();
 		sampleFrame * buf = m_fxChannels[_ch]->m_buffer;
-		for( f_cnt_t f = 0; f < engine::mixer()->framesPerPeriod();
-									++f )
+		for( f_cnt_t f = 0; f < engine::mixer()->framesPerPeriod(); ++f )
 		{
 			buf[f][0] += _buf[f][0];
 			buf[f][1] += _buf[f][1];
@@ -110,9 +109,7 @@ void FxMixer::mixToChannel( const sampleFrame * _buf, fx_ch_t _ch )
 void FxMixer::processChannel( fx_ch_t _ch, sampleFrame * _buf )
 {
 	if( m_fxChannels[_ch]->m_muteModel.value() == false &&
-		( m_fxChannels[_ch]->m_used ||
-				m_fxChannels[_ch]->m_stillRunning ||
-								_ch == 0 ) )
+		( m_fxChannels[_ch]->m_used || m_fxChannels[_ch]->m_stillRunning || _ch == 0 ) )
 	{
 		if( _buf == NULL )
 		{
@@ -258,5 +255,3 @@ void FxMixer::loadSettings( const QDomElement & _this )
 	emit dataChanged();
 }
 
-
-#endif
diff --git a/src/core/Mixer.cpp b/src/core/Mixer.cpp
index db6a4c686..7f8db65c4 100644
--- a/src/core/Mixer.cpp
+++ b/src/core/Mixer.cpp
@@ -144,9 +144,7 @@ public:
 
 	MixerWorkerThread( int _worker_num, Mixer* mixer ) :
 		QThread( mixer ),
-		m_workingBuf( (sampleFrame *) aligned_malloc(
-					mixer->framesPerPeriod() *
-						sizeof( sampleFrame ) ) ),
+		m_workingBuf( (sampleFrame *) aligned_malloc( mixer->framesPerPeriod() * sizeof( sampleFrame ) ) ),
 		m_workerNum( _worker_num ),
 		m_quit( false ),
 		m_mixer( mixer ),
@@ -221,8 +219,7 @@ void MixerWorkerThread::processJobQueue()
 	const bool me = a->processEffects();
 	if( me || a->m_bufferUsage != AudioPort::NoUsage )
 	{
-		engine::fxMixer()->mixToChannel( a->firstBuffer(),
-							a->nextFxChannel() );
+		engine::fxMixer()->mixToChannel( a->firstBuffer(), a->nextFxChannel() );
 		a->nextPeriod();
 	}
 					}
diff --git a/src/core/audio/AudioPort.cpp b/src/core/audio/AudioPort.cpp
index 5071cc369..b8f909b40 100644
--- a/src/core/audio/AudioPort.cpp
+++ b/src/core/audio/AudioPort.cpp
@@ -38,10 +38,8 @@ AudioPort::AudioPort( const QString & _name, bool _has_effect_chain ) :
 	m_name( "unnamed port" ),
 	m_effects( _has_effect_chain ? new EffectChain( NULL ) : NULL )
 {
-	engine::mixer()->clearAudioBuffer( m_firstBuffer,
-				engine::mixer()->framesPerPeriod() );
-	engine::mixer()->clearAudioBuffer( m_secondBuffer,
-				engine::mixer()->framesPerPeriod() );
+	engine::mixer()->clearAudioBuffer( m_firstBuffer, engine::mixer()->framesPerPeriod() );
+	engine::mixer()->clearAudioBuffer( m_secondBuffer, engine::mixer()->framesPerPeriod() );
 	engine::mixer()->addAudioPort( this );
 	setExtOutputEnabled( true );
 }
@@ -64,8 +62,7 @@ AudioPort::~AudioPort()
 void AudioPort::nextPeriod()
 {
 	m_firstBufferLock.lock();
-	engine::mixer()->clearAudioBuffer( m_firstBuffer,
-				engine::mixer()->framesPerPeriod() );
+	engine::mixer()->clearAudioBuffer( m_firstBuffer, engine::mixer()->framesPerPeriod() );
 	qSwap( m_firstBuffer, m_secondBuffer );
 
 	// this is how we decrease state of buffer-usage ;-)