more changes on style