Clean up and change cat/show