Clean up Show impl a bit