The ugliness became less ugly

Disclaimer: it's still ugly.