Logic cleanup - no more len() check