try to follow latex3 style a bit better