some structural and style changes