Fix cleanup comparison number base