Clean up if statements

This should make Luis happy.