Catalog index and show cleaned up