A bit less ugly