Made it slightly less ugly