Made it less ugly