a little namespacing cleanup