Avoiding extra conditions

Just small cleanup