diff --git a/Source/Core/Common/ChunkFile.h b/Source/Core/Common/ChunkFile.h
index 89260d1acf..5f83c6604f 100644
--- a/Source/Core/Common/ChunkFile.h
+++ b/Source/Core/Common/ChunkFile.h
@@ -235,7 +235,7 @@ public:
 
 		while (true)
 		{
-			u8 shouldExist = (list_cur ? 1 : 0);
+			u8 shouldExist = !!list_cur;
 			Do(shouldExist);
 			if (shouldExist == 1)
 			{
diff --git a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp
index c01e0c2cd5..0722364086 100644
--- a/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp
@@ -181,7 +181,7 @@ void Wiimote::SendAck(u8 _reportID)
 	ack->reportID = _reportID;
 	ack->errorID = 0;
 
-	Core::Callback_WiimoteInterruptChannel( m_index, m_reporting_channel, data, sizeof(data));
+	Core::Callback_WiimoteInterruptChannel(m_index, m_reporting_channel, data, sizeof(data));
 }
 
 void Wiimote::HandleExtensionSwap()
diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
index c345c3492b..5ed1c55c73 100644
--- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
+++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp
@@ -91,7 +91,7 @@ void EmulateShake(AccelData* const accel
 	// shake is a bitfield of X,Y,Z shake button states
 	static const unsigned int btns[] = { 0x01, 0x02, 0x04 };
 	unsigned int shake = 0;
-	buttons_group->GetState( &shake, btns );
+	buttons_group->GetState(&shake, btns);
 
 	for (int i = 0; i != 3; ++i)
 	{
@@ -248,7 +248,7 @@ void Wiimote::Reset()
 	m_adpcm_state.step = 127;
 }
 
-Wiimote::Wiimote( const unsigned int index )
+Wiimote::Wiimote(const unsigned int index)
 	: m_index(index)
 	, ir_sin(0)
 	, ir_cos(1)
@@ -259,7 +259,7 @@ Wiimote::Wiimote( const unsigned int index )
 	// buttons
 	groups.emplace_back(m_buttons = new Buttons("Buttons"));
 	for (auto& named_button : named_buttons)
-		m_buttons->controls.emplace_back(new ControlGroup::Input( named_button));
+		m_buttons->controls.emplace_back(new ControlGroup::Input(named_button));
 
 	// ir
 	groups.emplace_back(m_ir = new Cursor(_trans("IR")));
@@ -297,7 +297,7 @@ Wiimote::Wiimote( const unsigned int index )
 		m_dpad->controls.emplace_back(new ControlGroup::Input(named_direction));
 
 	// options
-	groups.emplace_back( m_options = new ControlGroup(_trans("Options")));
+	groups.emplace_back(m_options = new ControlGroup(_trans("Options")));
 	m_options->settings.emplace_back(new ControlGroup::BackgroundInputSetting(_trans("Background Input")));
 	m_options->settings.emplace_back(new ControlGroup::Setting(_trans("Sideways Wiimote"), false));
 	m_options->settings.emplace_back(new ControlGroup::Setting(_trans("Upright Wiimote"), false));
@@ -770,8 +770,6 @@ void Wiimote::ControlChannel(const u16 _channelID, const void* _pData, u32 _Size
 	if (99 == _channelID)
 	{
 		// Wiimote disconnected
-		//PanicAlert( "Wiimote Disconnected" );
-
 		// reset eeprom/register/reporting mode
 		Reset();
 		return;
diff --git a/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp b/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp
index 3e43b9a9ef..42528603a6 100644
--- a/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp
+++ b/Source/Core/VideoBackends/Software/SWCommandProcessor.cpp
@@ -58,7 +58,7 @@ void DoState(PointerWrap &p)
 	p.Do(interruptWaiting);
 
 	// Is this right?
-	p.DoArray(g_video_buffer_read_ptr,writePos);
+	p.DoArray(g_video_buffer_read_ptr, writePos);
 }
 
 static void UpdateInterrupts_Wrapper(u64 userdata, int cyclesLate)
diff --git a/Source/Core/VideoCommon/MainBase.cpp b/Source/Core/VideoCommon/MainBase.cpp
index 998ff5b7c0..fc36906cdb 100644
--- a/Source/Core/VideoCommon/MainBase.cpp
+++ b/Source/Core/VideoCommon/MainBase.cpp
@@ -36,7 +36,7 @@ static volatile struct
 
 void VideoBackendHardware::EmuStateChange(EMUSTATE_CHANGE newState)
 {
-	EmulatorState((newState == EMUSTATE_CHANGE_PLAY) ? true : false);
+	EmulatorState(newState == EMUSTATE_CHANGE_PLAY);
 }
 
 // Enter and exit the video loop