Simpler discounts with proper logic flow