Made some changes to correct spacing