minor changes on style