added using namespace protection
core files cleaned