Re-organized compare