Move more inspector logic to Inspector