entry type refactoring