clean up logging, modify metric namespacing