Cleanup and beautifycation of jcd show