Removing custom inspect
Consolidating common code