quick code refactor to simplify the process function and prepare the migration to the normalizer