(Minor) Refit code