Move more normalize stuff to the type component