using namespace imports, minor namespace related fixes, cleanup