Removed nested if