v0.15 Refactor inspectors to use base class