Refactoring
Make utility types shorter
refactor