some changes on style