- Began refactoring type prop