Clean up and fixed part of Undo Closing Tabs
More cleaning