more namespacing of private functions