Split some of the if statements.

ex. 

if (x || y || z) 

became if (x)
		else if (y)
		else if (z)