some updates of style