diff --git a/queen/cutaway.cpp b/queen/cutaway.cpp
index 445fe4da5cf..874480f3d50 100644
--- a/queen/cutaway.cpp
+++ b/queen/cutaway.cpp
@@ -440,7 +440,7 @@ Cutaway::ObjectType Cutaway::getObjectType(CutawayObject &object) {
 		objectType = OBJECT_TYPE_NO_ANIMATION;
 	}
 
-	switch(object.objectNumber) {
+	switch (object.objectNumber) {
 	case -2:
 		// Text to be spoken
 		objectType = OBJECT_TYPE_TEXT_SPEAK;
diff --git a/queen/queen.cpp b/queen/queen.cpp
index 9fb5da6dd96..70f2f038cd4 100644
--- a/queen/queen.cpp
+++ b/queen/queen.cpp
@@ -71,17 +71,17 @@ GameList Engine_QUEEN_gameList() {
 }
 
 GameSettings determineTarget(uint32 size) {
-	switch(size) {
-		case 3724538:	//regular demo
-		case 3732177:
-			return queen_setting[1];
-			break;
-		case 1915913:   //interview demo
-			return queen_setting[2];
-			break;
-		default:	//non-demo
-			return queen_setting[0];
-			break;
+	switch (size) {
+	case 3724538:	//regular demo
+	case 3732177:
+		return queen_setting[1];
+		break;
+	case 1915913:   //interview demo
+		return queen_setting[2];
+		break;
+	default:	//non-demo
+		return queen_setting[0];
+		break;
 	}
 	return queen_setting[0];
 }
diff --git a/queen/sound.cpp b/queen/sound.cpp
index f982ce9d6ce..0170d451bc3 100644
--- a/queen/sound.cpp
+++ b/queen/sound.cpp
@@ -47,37 +47,37 @@ Sound *Sound::giveSound(SoundMixer *mixer, QueenEngine *vm, uint8 compression) {
 	if (!mixer->isReady())
 		return new SilentSound(mixer, vm);
 	
-	switch(compression) {
-		case COMPRESSION_NONE:
-				return new SBSound(mixer, vm);
-				break;
-		case COMPRESSION_MP3:
-				#ifndef USE_MAD
-					warning("Using MP3 compressed datafile, but MP3 support not compiled in");
-					return new SilentSound(mixer, vm);
-				#else
-					return new MP3Sound(mixer, vm);
-				#endif
-				break;
-		case COMPRESSION_OGG:
-				#ifndef USE_VORBIS
-					warning("Using OGG compressed datafile, but OGG support not compiled in");
-					return new SilentSound(mixer, vm);
-				#else
-					return new OGGSound(mixer, vm);
-				#endif
-				break;
-		case COMPRESSION_FLAC:
-				#ifndef USE_FLAC
-					warning("Using FLAC compressed datafile, but FLAC support not compiled in");
-					return new SilentSound(mixer, vm);
-				#else
-					return new FLACSound(mixer, vm);
-				#endif
-				break;
-		default:
-				warning("Unknown compression type");
-				return new SilentSound(mixer, vm);
+	switch (compression) {
+	case COMPRESSION_NONE:
+		return new SBSound(mixer, vm);
+		break;
+	case COMPRESSION_MP3:
+#ifndef USE_MAD
+		warning("Using MP3 compressed datafile, but MP3 support not compiled in");
+		return new SilentSound(mixer, vm);
+#else
+		return new MP3Sound(mixer, vm);
+#endif
+		break;
+	case COMPRESSION_OGG:
+#ifndef USE_VORBIS
+		warning("Using OGG compressed datafile, but OGG support not compiled in");
+		return new SilentSound(mixer, vm);
+#else
+		return new OGGSound(mixer, vm);
+#endif
+		break;
+	case COMPRESSION_FLAC:
+#ifndef USE_FLAC
+		warning("Using FLAC compressed datafile, but FLAC support not compiled in");
+		return new SilentSound(mixer, vm);
+#else
+		return new FLACSound(mixer, vm);
+#endif
+		break;
+	default:
+		warning("Unknown compression type");
+		return new SilentSound(mixer, vm);
 	}
 }
 
@@ -161,15 +161,15 @@ void Sound::playSong(int16 songNum) {
 
 	int override = (_vm->resource()->isDemo()) ? _songDemo[songNum - 1].override : _song[songNum - 1].override;
 	switch (override) {
-		// Override all songs
-		case  1:
-			break;
-		// Alter song settings (such as volume) and exit
-		case  2:
-			_vm->music()->toggleVChange();
-		default:
-			return;
-			break;
+	// Override all songs
+	case  1:
+		break;
+	// Alter song settings (such as volume) and exit
+	case  2:
+		_vm->music()->toggleVChange();
+	default:
+		return;
+		break;
 	}
 	
 	_lastOverride = songNum;