minor namespacing, inlining