Minor cleanup on conditional