diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index c5aa4345fb..1b44c2e905 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -278,15 +278,15 @@ void AudioMixer::run() {
                         int16_t* sourceBuffer = otherNodeBuffer->getNextOutput();
                         
                         int16_t* goodChannel = (bearingRelativeAngleToSource > 0.0f)
-                        ? clientSamples
-                        : clientSamples + BUFFER_LENGTH_SAMPLES_PER_CHANNEL;
+                            ? clientSamples
+                            : clientSamples + BUFFER_LENGTH_SAMPLES_PER_CHANNEL;
                         int16_t* delayedChannel = (bearingRelativeAngleToSource > 0.0f)
-                        ? clientSamples + BUFFER_LENGTH_SAMPLES_PER_CHANNEL
-                        : clientSamples;
+                            ? clientSamples + BUFFER_LENGTH_SAMPLES_PER_CHANNEL
+                            : clientSamples;
                         
                         int16_t* delaySamplePointer = otherNodeBuffer->getNextOutput() == otherNodeBuffer->getBuffer()
-                        ? otherNodeBuffer->getBuffer() + RING_BUFFER_LENGTH_SAMPLES - numSamplesDelay
-                        : otherNodeBuffer->getNextOutput() - numSamplesDelay;
+                            ? otherNodeBuffer->getBuffer() + RING_BUFFER_LENGTH_SAMPLES - numSamplesDelay
+                            : otherNodeBuffer->getNextOutput() - numSamplesDelay;
                         
                         for (int s = 0; s < BUFFER_LENGTH_SAMPLES_PER_CHANNEL; s++) {
                             // load up the stkFrameBuffer with this source's samples
diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp
index d0492f3903..0f3b047a3f 100644
--- a/interface/src/Audio.cpp
+++ b/interface/src/Audio.cpp
@@ -121,8 +121,8 @@ inline void Audio::performIO(int16_t* inputLeft, int16_t* outputLeft, int16_t* o
                 unsigned char dataPacket[MAX_PACKET_SIZE];
                 
                 PACKET_TYPE packetType = Menu::getInstance()->isOptionChecked(MenuOption::EchoAudio)
-                ? PACKET_TYPE_MICROPHONE_AUDIO_WITH_ECHO
-                : PACKET_TYPE_MICROPHONE_AUDIO_NO_ECHO;
+                    ? PACKET_TYPE_MICROPHONE_AUDIO_WITH_ECHO
+                    : PACKET_TYPE_MICROPHONE_AUDIO_NO_ECHO;
                 
                 unsigned char* currentPacketPtr = dataPacket + populateTypeAndVersion(dataPacket, packetType);
                 
@@ -245,8 +245,8 @@ inline void Audio::performIO(int16_t* inputLeft, int16_t* outputLeft, int16_t* o
                         if (flangeIndex < 0) {
                             // we need to grab the flange sample from earlier in the buffer
                             flangeFrame = ringBuffer->getNextOutput() != ringBuffer->getBuffer()
-                            ? ringBuffer->getNextOutput() - PACKET_LENGTH_SAMPLES
-                            : ringBuffer->getNextOutput() + RING_BUFFER_LENGTH_SAMPLES - PACKET_LENGTH_SAMPLES;
+                                ? ringBuffer->getNextOutput() - PACKET_LENGTH_SAMPLES
+                                : ringBuffer->getNextOutput() + RING_BUFFER_LENGTH_SAMPLES - PACKET_LENGTH_SAMPLES;
                             
                             flangeIndex = PACKET_LENGTH_SAMPLES_PER_CHANNEL + (s - sampleFlangeDelay);
                         }