Cleanup - let's make IDEs more useful