PROBCORE-236 Refactoring StateInspector