Made it look better (maybe)