Refactored Inspector.