Fixed everything but code looks bad