- Refactored inspector