Simplified some conditionals