Clean up ugly baby for presentation