Make it slightly less ugly