Cleanup examples a little more