minor namespace/use tweak