- Began refactoring type prop analysis