Cleanup examples a bit