Made some changes to improve formatting