Removed nested conditions