some changes in formatting