Inspect refactoring to fit new architecture
Merge pull request #379 from typesafehub/wip/warry-inspect-refactoring

Inspect refactoring to fit new architecture