Made some alterations to make it look better