more consistent style
more consistent style