Refactor canonicalizers