Made it look better (I hope)