Migrate to new node function style