I Made it less ugly