Small refactor + update
Normalize is public.