A little inspector refactoring