Improving the inspector