More consistent style